PRD-4769 (partial) and fix for test case affected by gits line ending rewrite