MAM policy related fixes
Merge branch 'rc2' of github.com:WSO2Mobile/mam into rc2