[Merge] ~3v1n0/nux:preinst-conffiles-restore-xenial into nux:ubuntu/xenial

[Marco Trevisan (Treviño)]

The proposal to merge ~3v1n0/nux:preinst-conffiles-restore-xenial into nux:ubuntu/xenial has been updated.

Description changed to:

The diff also includes the change that are already in the way to bionic (proposed) as per sync with bzr

For more details, see:
https://code.launchpad.net/~3v1n0/nux/+git/nux/+merge/348390
-- 
Your team Unity Team is requested to review the proposed merge of ~3v1n0/nux:preinst-conffiles-restore-xenial into nux:ubuntu/xenial.