JBoss host fixes
Merge branch 'master' into composite