Merge proposals dependent on lp://qastaging/~alan-griffiths/mir/deduplicate-platform-plugin-symbols-maps

1. deduplicate-platform-plugin-symbols-maps
2. Dependent merge proposals