Merge "Reduce lock interactions in backup transport management" into oc-mr1-dev