[2.12+2.13] backport some .gitignore additions

See the individial commits for details

I propose this patch for 2.12 and 2.13, which will bring the .gitignore in sync with master.