Merge branch 'TOMEE-2631' of https://github.com/Daniel-Dos/tomee into TOMEE-2631