JENA-536 (partial)

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

git-svn-id: https://svn.apache.org/repos/asf/jena/trunk@1524974 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch: upstream/trunk