Merge branch 'develop' into feature/user-account-settings

Conflicts:
	django-verdant/verdantadmin/templates/verdantadmin/home.html
	django-verdant/verdantadmin/urls.py
	django-wagtail/wagtail/wagtailadmin/templates/wagtailadmin/shared/main_nav.html
Fixed some old references to verdant
Merge branch 'wagtail-separation' into staging
Merge branch 'wagtail-separation' into staging
Merge branch 'wagtail-separation' into staging
Merge branch 'wagtail-separation' into staging
Merge branch 'wagtail-separation' into staging
Merge branch 'ldap-changes' into staging

Conflicts:
	django-verdant/rca/static/rca/js/filters.js
merge 002b896e45b48c5ca80c3ed3cb8f4a2f921f8af8 (allow password management to be enabled/disabled by the WAGTAIL_PASSWORD_MANAGEMENT_ENABLED setting). Need to apply manually because git chokes on the lack of submodules on the feature/user-account-settings branch.