HIVE-9375 - Fix merge issue with TestSymlinkTextInputFormat.testCombine [Encryption Branch] (Sergio via Brock)