BZ1078186

WildFly PR merged accordingly: https://github.com/wildfly/wildfly/pull/6522/files