only kill all states if the IP changed. ticket #1629
Allow accept_unencrypted_mainmode_messages to be enabled if needed
Merge remote-tracking branch 'upstream/master'