BZ-1063864 back port HORNETQ-1278 into EAPs

:: https://bugzilla.redhat.com/show_bug.cgi?id=1063864
:: https://issues.jboss.org/browse/HORNETQ-1278