Merge change 25634 into eclair

* changes:
  Report NO_CONNECTIVITY when failover net unavail