Cleanup the handling of --strategy-option now that we no longer need
to support "--preserve-merges" and properly quote the argument when
saving it to disc.

These patches are based on a merge of 'master' and
'ab/fix-strategy-opts-parsing'

Version: 1
Message-ID: <cover.1678893298.git.phillip.wood@dunelm.org.uk>
Submitted-As: https://lore.kernel.org/git/cover.1678893298.git.phillip.wood%40dunelm.org.uk