Fixing an issue in PAAS-76 fix
Merge branch 'master' of https://github.com/wso2/private-paas