HORNETQ-1217 manual fixes
HORNETQ-1217 manual fixes: TO REBASE
HORNETQ-1217 manual fixes: @Test
HORNETQ-1217 manual fixes: @Test
HORNETQ-1217 manual fixes: @Test
HORNETQ-1217 manual fixes: @Test