Merge the BROKER_FAILOVER_STRATEGY patch into Master