Merge "Add Sonar support for pkgtools"