jerith Merge branch 'rabbitmqctl-wait' into develop