Adjustments to IMS prepare_instrument_device_support for IAI instead of IA
Update IMS prepare_platform_device_support to have PAI instead of PA assoc
Bump ion-defs
Bumped to latest ion-defs to include merged PR for prepare mods
Merge branch 'master' into prepare_mods
Merge pull request #1119 from daf/prepare_mods

Prepare mods (Instrument device/platform device)