Merge branch 'share_p9' into next
Merge branch 'diskbus_config' into next
Merge branch 'fix_driver_spec_test' into next

Conflicts:
	lib/vagrant-kvm/driver/driver.rb
	spec/vagrant-kvm/driver/driver_spec.rb