backport runner fixes thanks @benolee @kennyj

Backport cc7dd66 and c0ba0f0, which fix the runner
loading issue from issue #7683


closes #7695 #882