Apply patch from Romain for: https://issues.apache.org/jira/browse/TOMEE-1199

git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/trunk@1593221 13f79535-47bb-0310-9956-ffa450edef68