SSP-3014 Fix unit test compilation errors
NOJIRA Adjust SCM config to reflect fork