JENA-1649, JENA-1650 : Merge commit 'refs/pull/508/head' of https://github.com/apache/jena
JENA-1649, JENA-1650 : Merge commit 'refs/pull/508/head' of https://github.com/apache/jena

This closes #508.

apache/jena,apache/jena,apache/jena,apache/jena,apache/jena,apache/jena,apache/jena,apache/jena