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