Merge pull request #2474 from ethomson/clar_file_report Switch description and message reporting in `clar__assert_equal_file`