Fix for APPM-41
Merge branch 'master' of https://github.com/wso2/app-manager