Fix for PAAS-61
Merge branch 'master' of https://github.com/wso2/private-paas