merging https://github.com/wso2/private-paas/pull/27/files
Merge branch 'master' of https://github.com/wso2/private-paas