Update project to use LogbackAmqp rev 11 (ZK config) and re-merge with
master