Merge lp:~3v1n0/upstart/activation-proper-dbus-path into lp:upstart

[Marco Trevisan (Treviño)]

Control: use the /org/freedesktop/DBus canonical path for updating the activation environment variables

=== modified file 'init/control.c'
--- init/control.c	2015-05-16 19:12:37 +0000
+++ init/control.c	2016-05-06 16:06:27 +0000
@@ -1445,7 +1445,9 @@
 					dbus_vars[0]->item1 = nih_strdup (dbus_vars[0], "");
 				}
 
-				dbus_proxy = NIH_SHOULD (nih_dbus_proxy_new (dbus_vars, control_bus, "org.freedesktop.DBus", "/", NULL, NULL));
+				dbus_proxy = NIH_SHOULD (nih_dbus_proxy_new (dbus_vars, control_bus,
+					"org.freedesktop.DBus", "/org/freedesktop/DBus", NULL, NULL));
+
 				if (! dbus_proxy) {
 					nih_warn (_("Failed to get dbus_proxy"));
 				} else {