Move oauth2 expression handler to the plugin; improve zookeeper reliability.