Freeze the testing runtime configs at a latter stage
Merge pull request #17213 from s0undt3ch/hotfix/freeze-configs-delayed

Freeze the testing runtime configs at a latter stage
Merge branch '2014.7' into develop
Merge pull request #17214 from s0undt3ch/develop

Merge branch '2014.7' forward into develop