Merge "Increase default RabbitMQ/Erlang TCP timeout from 5 to 15 seconds"