Remove some (but not all) duplication of SSH key path.
Address review comment: More accurate test name.
Merge pull request #387 from ClusterHQ/apply-volume-changes-368

Apply volume changes.

Fixes #368.
Merge remote-tracking branch 'refs/remotes/origin/master' into volume-calculation-388