TBD-1218: Update the mappings.xml file for Hive and Impala
Merge branch 'maintenance/5.6'