Cleanup form-overwrite test a bit
Restore django < 1.6 compatibility