Apply fixes from olamy for the dependency on tools.jar. As a result of this change, the build now requires telling Maven to activate the "tools.jar" profile (eg. "-Ptools.jar")