and some changes to master-hornetq

Signed-off-by: Ilan Goldenstein <ilan.goldenstein@ravellosystems.com>