Fix Conflict Resolver spelling.
Adding Instrument manager and Data Integrity Flag to loris menu.
Remove hardcoding of menu IDs from default schema.
Move patch out of the archive since it was not added before the release.:
Fix ordering and added comma to patch.
Merge pull request #728 from taracampbell/loris_menu_fixes

Loris menu fixes