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