Merge "Update Sonar Scanner version"