Merge "Adjust tests for delay in restarting/migrating IKE"