wildfly/wildfly — pull request #6005 by emuckenhuber (2014-03-06 15:05:17+00:00)
Title: fixes for WFLY-3008 and WFLY-3000

https://issues.jboss.org/browse/WFLY-3008
https://issues.jboss.org/browse/WFLY-3008