And also move config related commands into one place. Fixes QubesOS/qubes-issues#2844 (cherry picked from commit e67cae1f74)
e67cae1f74