Fix shutdown logic in GerritManager
First bring up new handler to gerrit-trigger

Including refine and fix gerrit-events