Merge fixes for 

AMQNET-505
AMQNET-506
AMQNET-507
AMQNET-508
4 files changed