Java7/8 clean up

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