Ensure host-shutdown target calls the host-stop target

As a part of the soft power off (host-shutdown) ensure
that the host-stop target always gets called.  Updated the
involved services to ensure they are run in the correct order.

Change-Id: I7e9113631786f0d0cb0f89b94c4b97fdc0328e7b
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
index 1043578..d3efca5 100644
--- a/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
+++ b/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target
@@ -1,7 +1,9 @@
 [Unit]
 Description=Host%i (Stopped)
 Wants={SYSTEMD_DEFAULT_TARGET}
-After=obmc-host-stop@%i.target
+Wants=obmc-host-stopping@%i.target
+After=obmc-host-stopping@%i.target
+Before=obmc-power-stop-pre@%i.target
 Conflicts=obmc-host-start@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes