TBD-1167 : NPE error occur when I click edit query for HBase of CDH5.1
MR1
Merge remote-tracking branch 'origin/bugfix/5.6/TBD-1167_NPEOfEditQueryActionOfHBase'