ISPN-4431 Make the CLI codecs add an EntryVersion to the metadata
- Also increase the CLI timeout