[JOHNZON-193] Backport for TomEE 7.0.x

[Daniel Cunha]

Hi folks,

I sent a PR to backport changes for JOHNZON-193.
Please, review it: https://github.com/apache/johnzon/pull/31

Thank you.
-- 
Daniel "soro" Cunha
https://twitter.com/dvlc_