TDI-31382 :Can't show delete folder if this folder is names as Hive
Merge branch 'maintenance/5.6'