Fixing APPM-17 and APPM-18
Merge branch 'master' of https://github.com/wso2/app-manager