TBD-1333:The default port for Pivotal HD 2.0 HBase is wrong.
Merge branch 'maintenance/5.6'