change conditional
remove can-failover because it's deprecated
Merge remote-tracking branch 'jgb/2.0.0_wip' into 2.0.0_wip