Uncomment command error block that now returns conflict from MI process correctly.
Merge pull request #1701 from edwardhunter/agent_error_rebase

Fixes command_errror_test in instrument agent.
OOIION-1697: Discovery should not return retired resources
Bumped pyon
Merge pull request #1704 from mmeisinger/fix1697_assoc_m

OOIION-1697: Discovery should not return retired resources
Bump pointer for OOIION-1707, OOIION-1711
Merge pull request #1707 from jamie-cyber1/func

Bump pointer for OOIION-1707, OOIION-1711
Changes CTDMO -> SP_MFLM scenario
Updates the ion-functions submodule for magvar
Merge pull request #1708 from lukecampbell/ctdmo

TEST - Changes CTDMO -> SP_MFLM scenario
Merge pull request #1710 from lukecampbell/magvar

TEST - Updates the ion-functions submodule for magvar