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

Merged by openshift-bot