Provision to override shipment weight #6058

`return self.override_weight or return self.get_computed_weight()`