[jboss-as7-dev] Bootstrap work merged into upstream