Removed custom unit definitions that conflict with the udunits2 library, version 2.2.20.
Removed custom unit definitions that conflict with the udunits2 library, version 2.2.20.

stcorp/harp,stcorp/harp,stcorp/harp,stcorp/harp,stcorp/harp,stcorp/harp