JBIDE-15597 (4.1.1 beta1x rebase)

Here is the results of yesterday and this morning's rebased branch.  This one should work better, given that I did not depend on the merge tool, as I did last time. (3.5 hours... woo hoo... Lol...)