Fixing https://wso2.org/jira/browse/PAAS-65
Merge branch 'master' of https://github.com/wso2/private-paas