Merge pull request #501 from patriot1burke/master

fix delete when cache is on
Changes in representations - adding role mappings under user representation
Merge pull request #503 from patriot1burke/master

admin rest api test
Merge pull request #502 from mposolda/master

Changes in representations - adding role mappings under user representat...
fix json file