Merge "Add --safe-links to synchronize invocations" into feature/zuulv3