Adjusting Vagrant and moving files to autotest repro.

Conflicts:

	reset_db.sh