[mdt-ocl.dev] UML2 4.0M2 alignment

[Ed Willink <ed@xxxxxxxxxxxxx>]

Hi

We have successfully got an M2 build for UML 4.0M2, but I have used the 
releng discretion for emergency commits to make changes to core code 
that have not been reviewed.

It would be good if someone could go through the [358558] commits, 
probably just to identify the affected plugins and then to diff before 
and after.

    Regards

        Ed