Merge "Mark libdiskconfig vendor_available." into oc-dev