Fix cleanup_job for newer job error checking logic.
Eliminate unneeded if in jobs/__init__.py.

Checking if job.state is ERROR when that cannot be (method returns self.fail above this if that were the case). Even if it were somehow possible, subsequent code would fail badly with final_job_state not being set.