Merge "Updating cinder job with ACTIVE_STANDBY and failover tests"