BISERVER-8144 - moved composite key creation for roles and tenant to jcr