Merge pull request #8116 from SvenDowideit/use-boot2docker-shellinit

boot2docker shellinit will set any and all env vars needed.