Remove unnecessary local overrides. [1769]
Mostly non-code updates to local overrides. [1769]

This makes diffing things a little easier.
Fix Jython history not being exported properly.

[1618]