Please merge PR #597

[Richard Monson-Haefel]

https://github.com/apache/tomee/pull/597
<https://github.com/apache/tomee/pull/597#issuecomment-552677710>

-- 
Richard Monson-Haefel
https://twitter.com/rmonson
https://www.linkedin.com/in/monsonhaefel/