Fix mismerge / failing reconfigurator-cli tests (#6864)

#6788 added expectorate tests of `reconfigurator-cli`, and #6836 changed
behavior that affected those tests but not in a way that conflicted at
the git level. This catches us up to both changes.

Author: jgallagher