Additional dev related exclusions in gitignore, small cleanups in old upgrade classes.