SONAR-4069 Refactoring to fix issues with ProjectBuilder