Addressing review comments from hashicorp plugin PR

[cf-gitbot]

We have created an issue in Pivotal Tracker to manage this:

https://www.pivotaltracker.com/story/show/180276842

The labels on this github issue will be updated when the story is started.