For M2 Remy added some deployer changes that allow big deploy time improvements if an webapp has a jboss-scanning.xml. To take advantage of this, in Branch_6_0_0_M2/build/build.xml I added a hack to sticka jboss-scanning.xml into the exploded admin-console. I'm not porting that to trunk since for M3 we've got time to do it right and get it in the war the EMBJOPR team publishes. This JIRA is to track that.