Merge "Fix deprecated kombu_ssl options for RMQ"