Merge "Fix multiple role paths" into feature/zuulv3