Report admin and user held jobs as "Held"

Previously jobs that had been held by a user or by the admin were
reported as just "waiting" - fix that.