Merge branch 'remove-keycloak-hack' into 'master'

grafana: Use builtin functionality to restrict access

See merge request !443
2 jobs for master in 54 seconds (queued for 11 seconds)