TMSS-207: merged master into this feature branch so we're up to date for commissioning

SAS/TMSS/docker/tmss-nginxenv/docker-compose.yml

...xenv/docker-test-mozilla-django-oidc/.circleci/config.yml

.../tmss-nginxenv/docker-test-mozilla-django-oidc/HISTORY.md

...er/tmss-nginxenv/docker-test-mozilla-django-oidc/Makefile

...r/tmss-nginxenv/docker-test-mozilla-django-oidc/README.md

...inxenv/docker-test-mozilla-django-oidc/docker-compose.yml

...r-test-mozilla-django-oidc/dockerfiles/oidc_e2e_setup_py2

...r-test-mozilla-django-oidc/dockerfiles/oidc_e2e_setup_py3

...er-test-mozilla-django-oidc/dockerfiles/oidc_testprovider

...cker-test-mozilla-django-oidc/dockerfiles/oidc_testrp_py2

...cker-test-mozilla-django-oidc/dockerfiles/oidc_testrp_py3

...cker-test-mozilla-django-oidc/dockerfiles/oidc_testrunner

...v/docker-test-mozilla-django-oidc/testprovider/bin/run.sh

...ocker-test-mozilla-django-oidc/testprovider/fixtures.json

...nv/docker-test-mozilla-django-oidc/testprovider/manage.py

...mozilla-django-oidc/testprovider/oidcprovider/__init__.py

...ngo-oidc/testprovider/oidcprovider/management/__init__.py

...testprovider/oidcprovider/management/commands/__init__.py

...stprovider/oidcprovider/management/commands/createuser.py

...mozilla-django-oidc/testprovider/oidcprovider/settings.py