Merge branch 'master' into 0.8

CHANGELOG.md

@@ -71,6 +71,7 @@ BUG FIXES:
    [GH-3619]
  * client: Fix allocation accounting in GC and trigger GCs on allocation
    updates [GH-3445]
+ * driver/docker: Fix container name conflict handling [GH-3551]
  * driver/rkt: Remove pods on shutdown [GH-3562]
  * driver/rkt: Don't require port maps when using host networking [GH-3615]
  * template: Fix issue where multiple environment variable templates would be

scripts/vagrant-linux-priv-go.sh

@@ -21,6 +21,7 @@ install_go
 	
 # Ensure that the GOPATH tree is owned by vagrant:vagrant
 mkdir -p /opt/gopath
+chown -R vagrant:vagrant /opt/gopath
 
 # Ensure Go is on PATH
 if [ ! -e /usr/bin/go ] ; then