kcm: Cleanup in preparation for final fixes on manual printer configuration

Mike Noerequested to merge
work/noee/cleanup-for-manualfix into master

See commits for details: highlight fixes and manual configure fixes, no string changes

Prep for !117 (merged)

Merge request reports