Merge "configstore-utils: vendor_available" into oc-dev