Changes to reflect latest version of GraphDB (and QA server changes)