Merge branch 'master' into release/2.6.0

Author: valentijnscholten

dojo/survey/views.py

@@ -384,7 +384,7 @@ def questionnaire(request):
     messages.add_message(request,
                                  messages.INFO,
                                  'Surveys have migrated to core DefectDojo! Please run python3 manage.py migrate_surveys to retrieve data. ' +
-                                 'For docker-compose, run `docker ps -a` to find the uwsgi container name then `docker exec -it <conainter_name> ./manage.py migrate_sruveys`',
+                                 'For docker-compose, run `docker ps -a` to find the uwsgi container name then `docker exec -it <conainter_name> ./manage.py migrate_surveys`',
                                  extra_tags='alert-info')
 
     add_breadcrumb(title="Questionnaires", top_level=True, request=request)