Fix for bug 968952
 - Fixing application alias validation regex
Fix for bug 969165
Fixing alias tests
Merge pull request #2703 from abhgupta/stage_fix_968952_and_969165

Merged by openshift-bot