HHH-7996 arquillian-based OSGi unit test, minor CL fixes