Merge branch 'fix-ldap' into 'master'

Fix ldap

See merge request !102
2 jobs for <span class="ref-name">297-backport-fixes-from-v0-6-2</span> in 1 minute and 54 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #5731
lint
test:lint

00:00:44

passed #5732
docker
test:py3.6

00:01:54

46.0%