Further tweaks to ExprTransformConstantFold (JENA-630) and tweaks to align jena-security with Andy's API tweaks

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