Merge "Update docker http/broker topologies." into stable-3.4