SWITCHYARD-2239 - Updates to work with Luna's EMF Compare