update version to 3.6.10.2 and datastore dependency to 2.0.2.RELEASE
update to 2.3.1