Apply Andy's revised patch for constant folding (JENA-630)

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