Adjust prepare instrument_device data to include IAI instead of IA
Adjust prepare platform_device data to include PAI instead of PA
Merge branch 'master' into prepare_mods
Merge pull request #372 from daf/prepare_mods

Prepare mods (Instrument device/platform device)