Fixed some errors introduced by the big merge
Merge branch 'master' of https://github.com/payara/Payara into jbatch-changes
Merge pull request #98 from smillidge/jbatch-changes

Jbatch changes