Merge "Revert "Register term_handler for all zuul apps""