Merge change 6883 into donut

* changes:
  Add error code in vpn connectivity broadcast.