Merge changes from topics "recoveryTimeUnit", "vpnRecovery"

* changes:
  Update the time unit for recovery timer
  Perform VPN data stall recovery on unvalidated VPN network