django 1.7 fixes for test runs.