Imported using git-ubuntu import.
Changelog parent: 583d34e58470cbef50f7734cd5f8f3065c353f88
New changelog entries:
* make sure the NM configuration mangling of touch images uses the sudo and
not the admin group, "admin" is dead since years ... (LP: #1217596)
* drop a few superfluous env vars on request of Ted Gould
