Fix problem with cmd.run with onlyif and unless

Fixes #5013