Merge "Add a short name to the project in the inventory" into feature/zuulv3