Merge pull request #1119 from daf/prepare_mods

Prepare mods (Instrument device/platform device)
Fix assoc list in IMS prepare to include unassoc'd AgentInstances