Merge "Update the XSQL jdbc driver to support pentaho"