SONAR-5644 Apply some feedback on SCM API