Merge "Avoid using apt-add-repository" into feature/zuulv3