Merge two different sets of changes.

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