fix of APPM-14
Fixed APPM-13
Merge branch 'master' of https://github.com/wso2/app-manager