clean up commit from rig1 before upgrade to win server 2016
Authored by: kellgeor 2020-05-20
Parent: [r338]
Child: [r340]