classes-dbus: Instantiate obmc-phosphor-systemd

Instantiate obmc-phosphor-systemd and translate SYSTEMD_%
variables appropriately.

This enables systemd unit files that adhere to the standard
naming convention:
  <dbus service name>.service
to be found via DBUS_SERVICE_${PN} and inherit the functionality
of the obmc-phosphor-systemd class.

Add DBUS_USER_%s_%s and translate to SYSTEMD_USER_%s_%s appropriately.

Change-Id: I14f2f6eac60add478c1793da29ba15518dcd958e
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service b/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service
similarity index 100%
rename from common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service
rename to common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service
diff --git a/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service b/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
index 8612b98..4defe5e 100644
--- a/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
+++ b/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Phosphor OpenBMC DBus REST daemon
-Requires=obmc-mapper.service
-After=obmc-mapper.service
+Requires=org.openbmc.ObjectMapper.service
+After=org.openbmc.ObjectMapper.service
 
 [Service]
 Restart=always