Resolve "PCA bypass command-line option" - Part 1: preparatory test system changes See merge request !1188