Apply trunk changes that apply locally.

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