RF-13344, RF-13346: Added a _addUnitsIfRequired method to bridge-base and used it in the pick and ordering lists to add units to numerical height values