Cesar has a pending PR, I resolved the conflicts for him. Can someone merge it? It will get too outdated and will be hard to merge later if it takes too long. https://github.com/apache/tomee/pull/317
Also this can be closed: https://github.com/apache/tomee/pull/295
