Merge "configstore: remove configstore 1.1" into oc-dr1-dev
am: a44eece105  -s ours

Change-Id: I4d310b55a94074ec62e8664acd06dda92a631fd8