Port HORNETQ-651 from master