* backport of commit 06b9325bb9e6616789c4fe5e7778459ba98a14ab * fix server.go imports --------- Co-authored-by: Peter Wilson <peter.wilson@hashicorp.com>