Merged revision(s) 1608538-1608854 from tomee/tomee/trunk

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