Changes to store configs
Merge branch 'rc4' of github.com:WSO2Mobile/mam into rc4