Changing logic of waiting to domain after restart, calling _restart_domain method instead of domain.create() when creating new domain

Change-Id: Iefb8baba7e2719b0edcd42c2d16e5b37ab64fa78
+refactor+minor changes

Change-Id: Ifd1866178858b191951948b9c9de6ad1d2e5455b