Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
Merge remote-tracking branch 'origin/maint-0.2.5'