Merge pull request #1 from cchacin/master

TomEE 1.7.0