Revert changes made to settings files and Jython source code.

Meeting request for Jython source code to not be modified.
Also reverting unintentional changes to org.eclipse.jdt.ui.prefs files.
Fix more type warnings. AMEND PLEASE
Type fixes 1 - AMEND THIS, keep local, squash for remote.
Merge branch 'typefixes' into f18_test
More fixes. SQUASH & AMEND PLEASE