Merge "Register term_handler for all zuul apps" into feature/zuulv3