PRD-3278, PRD-4988 - Fixing excel export

Also trying to convince GIT that the line ending changes it pulls in from upstream/master are really not changes at all.