Don't add the dest routing key to the headers if it is 'none'.
Merge bug26318
stable to default