Merge changes Icf3a5583,Idd0fd1cc

* changes:
  Increase sleep timeout of testNetworkFailedRollback_Phase3 (4/n)
  Do a reboot before starting each test (3/n)