JBIDE-6313 important changes to pull esb away from deprecated wtp classes

The attached patch makes esb align very closely with the much better organized wtp code. The upstream finally works very well, and the old classes are deprecated, so its 100% time to move away.