Merge "Fix logic in disabling BackupTransport in DO mode." into nyc-mr1-dev