FYI, I backported a couple of fixes for TOMEE-1694 from master to tomee-1.7.x.
https://github.com/jgallimore/tomee/commit/dbb84791b72485f410d388bbb9a46d4f3a72c58c https://github.com/jgallimore/tomee/commit/532ee1be14c1c5ecad1ba8052a154dc9876ccafa Please let me know if that is an issues. Cheers Jon
