Merge "Fix backup path for pike ovs and dvr"