Fix error message from Conductor during minion error reporting.

coriolis/conductor/rpc/server.py

@@ -1681,7 +1681,7 @@ class ConductorServerEndpoint(object):
             constants.EXECUTION_STATUS_AWAITING_MINION_ALLOCATIONS)
         if migration.last_execution_status != awaiting_minions_status:
             raise exception.InvalidReplicaState(
-                "Machine is in '%s' status instead of the expected '%s' to "
+                "Migration is in '%s' status instead of the expected '%s' to "
                 "have minion machines allocations fail for it." % (
                     migration.last_execution_status, awaiting_minions_status))
 

coriolis/minion_manager/rpc/server.py

@@ -1072,7 +1072,7 @@ class MinionManagerServerEndpoint(object):
                     minion_machine.id, minion_machine.allocation_status,
                     minion_machine.allocated_action)
             LOG.debug(
-                "Attempting to deallocate all minion pool machine '%s' "
+                "Attempting to deallocate minion pool machine '%s' "
                 "(currently allocated to action '%s' with status '%s')",
                 minion_machine.id, minion_machine.allocated_action,
                 minion_machine.allocation_status)