Backport of GOPATH is being set incorrectly in latest CircleCI machine image into release/1.9.x (#15290)

* backport of commit b6ea75f31d9e977253b42e34bcb63d5e3ca4ca2a

* backport of commit 0bf0f090698300b5c2a6e1a2498863af84afd4d1
Co-authored-by: Christopher Swenson <christopher.swenson@hashicorp.com>