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