fix test failure
Merge pull request #1592 from gaohoward/master

fix test failure
Making AMQP to be responsive... work in progress