BACKLOG-4194 - Regressions raised by code review
https://jira.jahia.org/browse/BACKLOG-4194

Cleanup in the SCM management