Improve locking oppotunity
Bumped amqp-client to 3.1.1