Merge "Fix for Sonar tests in POMs"