fix bz961216 and others related to url based apps
Merge pull request #2409 from rajatchopra/master

Merged by openshift-bot