remove merge method from HibernateGormStaticApi
annotate test entities

These test entities previously relied on runtime enhancement
remove JPA test for now

We need to work out how to handle runtime enhancement of JPA entities