Adjust InstrumentContext specs for new SurveyCompletion module.  #3500.

This commit also brings reference identifiers in associated test
surveys into sync with what's in the actual instruments.