XD-2483 Add codec option to hdfs-dataset sink
XD-2409 Changing correlation-strategy-expression

- partial reversal of earlier change to avoid errors when payload is a String