changes to client, server get all into one config
Merge branch 'mdm-scratch' of https://github.com/WSO2Mobile/mdm.git into
mdm-scratch