Merge "Add source to project and remove unused tenant attrs" into feature/zuulv3