Removed reference to uploadtemplate.models.Theme.set_as_default().
Corrected some tests/behavior for uploadtemplate changes.
Brought tests back to passing.
Merge branch 'uploadtemplate_changes' into 1.10.X