Merge "bug 1827 XSQL hangs when there is an empty dataset + Add Configuration datastore."