Applying patch from Danushka for amqp samples

25 files changed