Bug fixes
Merge branch 'alpha4' of https://github.com/WSO2Mobile/mdm into alpha4