Merge "Set Git SCM Defaults prior to JJB 1.6.2 upgrade"