Java 7 changes and some minor cleanup. [1423]
Fix problem with history in Jython Shell popup.

[1799]