Give priority to command line os parameters

OS Parameters defined as command-line arguments should overwrite the
ones given in the variants file.

Many thanks to Brian Candler https://github.com/candlerb for the
suggestion and all the help.