Merge "selectBackupTransportAsync should report failure when backup is not available" into oc-dev