Port remaining new commits from Kibana plugin

See https://git.floragunn.com/search-guard/search-guard-kibana-plugin/-/commits/master