Merge pull request #752 from afs/shacl-dev

JENA-1905, JENA-1906, JENA-1907: SHACL improvements