Force hostgroup order to avoid unnecessary restart

Change-Id: I0ea1591b57f8ed89954febd62c55e934f0d6a8fb