TBD-1297:Some small problems about EMR hive.
Merge branch 'maintenance/5.6'