Upgrade JBoss plugin
Merge branch 'jboss-plugin'