Fix OPAL-1729: Unable to import unit identifiers
Merge branch 'opal-1.13.x' of github.com:obiba/opal into opal-1.13.x