Reinstate old behaviour in jobfile.
suite environment file: fixes after restart tests.