Update to Util.php so it uses Doctrine2 for database access
Adjust for current tree.
Merge branch 'wfd2' into 1.3