Revert "[IMP] Move uom_data to another module"

Merged Jose Luis Zanotti requested to merge 12.0-stage into 12.0

This reverts commit d06fca58

Merge request reports