Revert "getting rid of problematic file"

This reverts commit 0e6bbcd5b74db75652fc848054db4c51785f4bd1.
Fix line-endings in problem file.
Merge branch 'maint-rel-1.6' into develop