* devel-2.2:
  Fix case of MAC special-values
  Remove mcpu's ReportLocks callback
  Revert "jqueue: Resume jobs from “waitlock” status"

(no conflicts, took LGTM from original commit)

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>