Upgrade son-handler to support Java-11