Fix up some tests:
- unlink copied files because they confused File_Structure_Test
- update golden files
Automated update of .build_number to 356 for branch master
Last update: f12aaf3c345fcce39fdbe721c896c03e3b429e58 (1 commits ago)
Follow-on to fd0051dab7258c817ff01877bd4324530ce79398 for #2006.

- fix unit tests for watermarks, which check for deleted files.
Merge pull request #154 from shadlaws/master

Follow-on to fd0051dab7258c817ff01877bd4324530ce79398 for #2006.
Automated update of .build_number to 357 for branch master
Last update: 12d68b89feea10855ce4c779f2afb543e40f1c21 (1 commits ago)
Merge branch 'master' into 3.0.x