made changes to test with previous version of django-waffle

updated the query count to test

testing with version 0.13

testing with version 0.14

testing with version 0.15

added version 0.14

updated the django-waffle version to use 0.18

updated the django-waffle version to use 0.16

updated the query counts to pass tests

ran make upgrade

updated the django-waffle to support django 2.2

made changes to test with previous version of django-waffle

updated the query count to test

testing with version 0.13

testing with version 0.14

testing with version 0.15

added version 0.14

updated the django-waffle version to use 0.18

updated the django-waffle version to use 0.16

updated the query counts to pass tests

removed the pdb statements

ran make upgrade

* Added pytest-json-report plugin
	- modifying app-opts in setup.cfg
	- adding hook to all conftest.py files in repo
	- setting report to be saved to test_root/log/warnings.json
	- Writing custom logic to save json report to avoid overwrite if pytest called twice
This was created to allow us to easily parse through test warnings in jenkins

Specifying a namespace in django.conf.urls.include() without providing an app_name is deprecated.
Adding the app_name attribute in the included module.

* Switch make upgrade to Python 3.5

* bok-choy fixes, constrain django-debug-toolbar

* Remove flaky bok-choy test

There was a serialization issue with one of the studio JS assets that
is rendered as a part of the edit view.

-point to updated edx-organizations package

updated the tests

minor changes

changes made verify capitalized country code

changes made verify capitalized country code

changes made stay consistent with country code implementation

changes made to test with previous implementation

updated the django-countries version to latest

updated the tests input to match the output

updated the constants to use updated country names according to new ISO standards

Upgrade django-ses

-bumped django-model-utils version to support django 22

downgrade the django-cors-headers version to 2.5.3

downgrade the django-cors-headers version to 2.5.3

updated the django-cors-headers to version that supports django 2.2

downgrade the django-cors-headers version to 2.5.3

downgrade the django-cors-headers version to 2.5.3

updated the django-cors-headers to version that supports django 2.2

downgrade the django-cors-headers version to 2.5.3

downgrade the django-cors-headers version to 2.5.3

ran make upgrade

BOM-1094

Upgrade django-debug-toolbar