Update box versions for BOSH 2710

Signed-off-by: Adam Stegman <astegman@pivotal.io>
Remove incorrect usage of local from test script

Signed-off-by: Adam Stegman <astegman@pivotal.io>
Merge branch 'develop'

Signed-off-by: Adam Stegman <astegman@pivotal.io>

Conflicts:
	Vagrantfile
Give boxes unique names by provider and version

* before this change, later versions of boxes would have collided because
  their name and version would be the same.

Signed-off-by: Adam Stegman <astegman@pivotal.io>
Update vagrant box versions

Signed-off-by: Adam Stegman <astegman@pivotal.io>
wip

Signed-off-by: Adam Stegman <astegman@pivotal.io>