Merge "Add support for Sonar pre-scan shell script"