Merge change 26366 into eclair

* changes:
  Set the bonding for incoming connections only when authentication is requested.