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

Change-Id: I95a712640d15282e0d4ba3e68b5f315ddb4e83dd
Signed-off-by: Sharon Aicler <saichler@cisco.com>
Merge "bug 1827 XSQL hangs when there is an empty dataset + Add Configuration datastore."