PAAS-153 fixes
Merge branch 'master' of https://github.com/gayangunarathne/private-paas