fix merge conflicts, fix tests on py3

supervisor/tests/base.py

@@ -922,7 +922,7 @@ class DummySupervisorRPCNamespace:
             raise Fault(self._readlog_error, '')
         return 'mainlogdata'
 
-    def signalGroup(self, name, signal):
+    def signalProcessGroup(self, name, signal):
         from supervisor import xmlrpc
         return [
             {'name':'foo_00',

supervisor/tests/test_rpcinterfaces.py

@@ -892,7 +892,6 @@ class SupervisorNamespaceXMLRPCInterfaceTests(TestBase):
         interface = self._makeOne(supervisord)
         result = interface.signalProcessGroup('foo', 10)
         self.assertEqual(interface.update_text, 'signalProcessGroup')
-
         # Sort so we get deterministic results despite hash randomization
         result = sorted(result, key=operator.itemgetter('name'))