Making sure that message with a pre-existing sagaId won't start new saga.

Fixes #2446
Merge branch 'hotfix-4.2.5'