Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:coati-00/brownfield_django
Merge branch 'rest_tests' of github.com:coati-00/brownfield_django into rest_tests
fixing more tests