Beanstalk Custom Vendor Setup [2/3]

Conflicts:
	envsetup.sh
	tools/roomservice.py