Merge "Append / to end of ansible_user_dir for rsync src" into feature/zuulv3