Merge "Fix pylint warnings in snaps"