Misc tidying and reformatting while passing.

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