Manual merge of https://github.com/example42/puppet-jboss/pull/22