Merge remote-tracking branch 'upstream/4_7_x' into 4_7_x

Conflicts:
	Vagrantfile
	xtuple-desktop/Vagrantfile
JR
Merge branch '4_7_x' of https://github.com/jrosengarden/xtuple-vagrant into 4_7_x

Conflicts:
	Vagrantfile
	xtuple-desktop/Vagrantfile