Merge "Don't double quote rsync options" into feature/zuulv3