Changes to fix rawhide build - Removed dependency on removed internal junit class - moved cmake reference to junit4.jar to junit.jar - Disambiguate a couple of references In the interest of getting a build going on rawhide and because these changes are pretty uncontroversial, I have pushed these to master. Please speak up if there are any objections. Ade