Github user doychin commented on the issue:
https://github.com/apache/tomee/pull/349
Conflict was introduced by commit
https://github.com/apache/tomee/commit/e7e80823b6014eb2e2a45d25234a5b661eeed8b1
This commit also contains the fix I propose in #347.---
