Pass instance to set_instance_error_state vs. uuid

Quick fix to patch one case in which instance.uuid was still being
passed to _set_instance_error_state when retries are disabled in
rescheduling cases.  Also updated the respective test case.

Change-Id: I24a682b926bc570d7e932ffedc664a95d41fda85
Closes-Bug: #1367342
Merge "Pass instance to set_instance_error_state vs. uuid"