Feature/glassfish

These modifications are needed to ensure that our integration tests against both an embedded glassfish and using a direct database connection for dbcheck work properly. Next step will be to deploy a standalone glassfish install in our images, but this is required first for jenkins builds.