XD-2409 Changing correlation-strategy-expression

- for spring-xd 1.0.x branch

- partial reversal of earlier change to avoid errors when payload is a String