Merge "Add etc/*.conf files to .gitignore"