Fix minor identity conditions, fix ciq addresses. Changes to support encoding.
Fix minor identity conditions, fix ciq addresses. Changes to support encoding.

emmanvg/cti-stix-elevator,oasis-open/cti-stix-elevator