update datastore version to 1.1.7 RELEASE
Merge branch '2.1.x' into 2.2.x