fixed KeyValue export and import
Merge upstream/fix-key-value-config-import into fix-key-value-config-import