Revert whitespace changes to files doing line by line comparison.
Merge branch 'update_test_paths_require_relative'