FU: Check for "filename" also for UKIRT & keep the file entry ...

... else Astro::FITS::HdrTrans fails for not finding a header translation class.
Mind that deleting the "file_id" (JCMT) entry did not have this bad effect.
(cherry picked from commit bf01132b699ac7b0f8977140e9c6c5d0e1077643)
FU: Whitespace changes.
(cherry picked from commit d6602266d10876d3512f59158851a726b4ee898d)