JOHNE - Merge gitignore lists from origin and upstream