Patch Set 4: Looks good to me, but someone else must approve; Unclean IP, do not check in

This is mine and Ketans code squashed and amended further to use import-packages instead of require plugins. Also added more copyright headers. Tested with Eclipse 3.4