CDB-976 #resolve Raise a named error when merging tables through columns with different types
Copies the category items when changing the legend to custom
Sets tab properties
Load carto lib for torque
CDB-817 #resolves We preserve the legend items of a CategoryLegend when enabling a CustomLegend
Merge remote-tracking branch 'origin/feature/CDB-817' into release/2.5.4
Merge remote-tracking branch 'origin/bug/CDB-976' into release/2.5.4