Adjust app for testing in vagrant readme to new autotest_services app.
Correcting merge error.
Updating autotest submodule.
Updating autotest submodule.
Updating autotest submodule and minor typo.
Updating autotest submodule.
Merge branch '0.4'

Conflicts:
	autotest