MDLSITE-2012 prechecker: ensure some vars are always set

Regression introduced by previous commit, some variables were
not being set anymore. And other jobs were needing them.

So, just ensuring they are set inconditionally.