Removing file listed twice warnings
Merge pull request #5205 from danmcp/master

Removing file listed twice warnings