backporting start of work done around TOMEE-1345 for embedded tomee

git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.7.x@1624855 13f79535-47bb-0310-9956-ffa450edef68