fix msg id problem
Merge branch 'rc1' of github.com:WSO2Mobile/mdm into rc1