Do not even check for MP or MT if disabled in executor

To improve the flexibility of our configuration and prevent anything strange happening with merge jobs, only check for MP or MT if disabled in executor.

--threads=X still get propagated from the main step's athenaopts, but this should be discussed how to be changed first. Will open a ticket.

/cc @tsulaia