Native python searching instead of grep
Properly quote some parameters to sed
Merge pull request #18987 from rallytime/cp-18218

Backport #18218 to 2014.1