Merge "Fix zuul.(yaml|d) loading order and add tests" into feature/zuulv3