Remove the OLD_* branches as early as possible; continuing a failed sync was failing when trying to sync master a second time, and conflicting during a pull due to the new subversion commit
Merge branch 'Sync_EarlyRemoveOLD'