grim/convey

Missed a bunch of updates on unit tests for the options update

2018-01-21, Gary Kramlich
2909e17deafe
Missed a bunch of updates on unit tests for the options update
environment:
- source=global-override