Clean up as part of intergation into Jena trunk.

git-svn-id: https://svn.apache.org/repos/asf/jena/trunk@1490639 13f79535-47bb-0310-9956-ffa450edef68