Fixed issue when updating the same role
Tenant theme fixes
Merge branch 'rc4' of github.com:WSO2Mobile/mam into rc4