#2060 - Make watermarks get filename using uploaded name, not uniquified filename

This makes us more robust against Kohana changing how temp filenames are generated.