Cherry-pick Use retrievalInstructions API Model and Updating AWS SPI' model' into release/0.19

Original MR: !31 (merged) Pre-Req MR: osdu/platform/system/dataset!307 (merged)

This MR is to add the AWS SPI and correct the Dataset response model for M16 (see original MR for more info).