GPII-672: Did minor fixes to get acceptance tests passing again (non-universal)
GPII-672: Fixed ISO-24751 entries to contain the id of the application as this is required by the matchmaking process. Also fixed issues with carla / magnifier match -- a datatype was missing for two of the settings and the ISO24751 version of carla NP set was invalid in that the application blocks have to be at top level