BISERVER-8144 - moving composite key creation for tenant to the jcr
code