Automatic merge from submit-queue

Fixes for golint tip

golint as of
https://github.com/golang/lint/blob/3390df4df2787994aea98de825b964ac7944b817/lint.go#L1440-L1442
requires that any function that has a context.Context argument have said
argument in the first position. This commit fixes the one function we had where
it wasn't.

cc @timothysc @wojtek-t @smarterclayton @jessfraz @kubernetes/rh-cluster-infra @liggitt @sttts @deads2k @eparis