.gitignore annoying resource files
Merge branch 'STREAMS-219'
Auto-merge | Integrating changes from apache/master