BZ1081570: Add check if running in domain mode
BZ1081990 / BZ1079288: Add restart button; fix for one-off patches