twhiteman rfd 42 instance migration - update from review comments

Latest commit a00a538

Aug 31, 2018