HDFS path is encoded twice when inserting to a partitioned table using dynamic partitions.

Tested on CDH 5.16.1 (Hive 1.1) and CDH 6.3 (Hive 2.2.1).

When file merging is enabled, ie. hive.merge.mapfiles or hive.merge.mapredfiles is true (or in case of spark hive.merge.sparkfiles), under specific conditions (see: ConditionalResolverMergeFiles, option 3.) on insert commands to partitioned tables, if Hive merges some partition files in a second job and moves the ones that do not need to be merged from the first jobs result, then the ones that can be moved are moved twice. This seems to cause file paths to be encoded twice as well
(FileUtils#escapePathName()) . For example, this can cause issues with partition values such as 'A:B' and 'C' to be encoded as 'A%3AB' for one partition path correctly and as 'C%253AD' for the other partition incorrectly.