Fix bug 3921: Follow-up to #3764. Cleanup gitignore