Merge branch 'master' into issue_477

requirements: upgrade ldap packages
settings: remove NISGroupType

Conflicts:
	circle/dashboard/models.py
	requirements/base.txt
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed cloud