Move AVS workarounds into new obmc-power-chassis targets

Change-Id: I49c9ce703673e18ef17684f0b3e02626ddb091af
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
index 1970f00..55957f3 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service
@@ -3,7 +3,7 @@
 Wants=avsbus-workaround@%i.service
 After=avsbus-workaround@%i.service
 Before=vrm-control@%i.service
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
 ExecStart={bindir}/avsbus-disable.sh
@@ -11,4 +11,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target