TDI-30442:remove the 3D style of natTable column header and clean some
code.
Merge branch 'maintenance/5.6'