ngompa pushed to snapd (master). "Fix the overlapping file conflicts between snapd and snap-confine (..more)"