Speeding up merges
<models/application.rb> standardize whitespace
<broker> conf to allow alias under cloud domain - bug 1040257

https://bugzilla.redhat.com/show_bug.cgi?id=1040257
<broker> always prevent alias conflicts with app names
Merge pull request #4607 from danmcp/master

Merged by openshift-bot
Merge pull request #4401 from sosiouxme/bug1040257

Merged by openshift-bot