Fixed 20613 - moved pickle loads/dumps outside with self._lock.reader()/writer() blocks
Additionaly added pickled=None initially and check for none before
returning in get
Merge branch 'ticket_20613' of https://github.com/ersran9/django into t20613
A few cleanups to capture the minimum amount of code in try/except blocks.