SSP-921 Committing updated changesets to SSP 1.2 release branch