fix disabling of optarch toolchain option + extend unit tests to also test disabling of toolchain options
Merge pull request #511 from boegel/disable_optarch

fix disabling of optarch toolchain option