Changes for JBoss 7
Merge branch 'IDMAPPS-578' of https://github.com/OpenIAM/openiam-idm-ce into IDMAPPS-578