Merge pull request #1154 from clebertsuconic/jms2

Update JMS API to 2.0 first pass