gplugin/gplugin

gplugin/gplugin/
Fix a few of our failing ci issues

2020-09-22, Gary Kramlich
0f07cacab39d