Cleanup tests and correct stderr to stdout in the appropriate places

Conflicts:
	acceptance/tests/linux/reboot_message.rb
	acceptance/tests/linux/reboot_timeout.rb