TUP-2330 : CDH5_error throw when click Finish for HBase
Merge remote-tracking branch 'origin/maintenance/5.6'