Merge pull request #57 from rmansoor/master

BISERVER-8144 - moved composite key creation for roles and tenant to jcr
BISERVER-8144 - updating the userRoleDao bean