Work on OPAL-2552: Attributes of variables and categories are lost after upgrading opal
Merge remote-tracking branch 'origin/opal-2.0.x' into opal-2.0.x