Pickling broken...
Fixed #19635 -- Made fields pickleable

Conflicts:

	django/db/models/sql/query.py
Fixed aggregation's abuse of plain field instances
Deepcopy support