fix unit test breakage in release-3.10#20206

Merged

openshift-merge-robot merged 2 commits intoopenshift:release-3.10from jim-minter:310unitfixes

Jul 4, 2018

+7-7

Commits on Jul 4, 2018

UPSTREAM: 62085: Fixes incorrect atomic usage
Jim Minter
committed
fix the go 1.10 unit test failures
Jim Minter
committed