Merge branch 'cmsfv2' into 'ibm-trunk'

Add CMSFv2 support

Add support for Custom Marshaled Stream Format version 2

See merge request !29