fixup! Upgrade to django 1.6
Merge pull request #6018 from open-craft/django17/braden-tests-cleanup

Minor test cleanups