Bug 957126/HORNETQ-1186 : Fix some example related issues

cherry-pick of #1074