Merge "configstore: remove configstore 1.1" into oc-mr1-dev