Merge "Remove -e from requirements" into feature/zuulv3