Merge branch 'master' of github.com:fog/fog into virtual_interfaces
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Follow message -> DEPRECATION Fog::XML::Connection is deprecated use Fog::Core::Connection instead
Fix wrong aliases at Fog::Volume::SakuraCloud::Archive
ability to supply serviceAccounts on image create

Takes an array of service accounts, with an email and scopes to add to an
instance on creation.
[ovirt] add support for ca cert
Merge pull request #2734 from abenari/ovirt

[ovirt] add support for ca cert
Merge pull request #2729 from higanworks/use_fog_core_connection_for_sakuracloud

Follow DEPRECATION message for sakuracloud
Merge pull request #2730 from higanworks/fix_sakuracloud_volume_template

Fix wrong aliases at Fog::Volume::SakuraCloud::Archive
added container commit request and fixed several tests in real mode
[google|compute] disk model: get_object fix for Ruby 1.8
Merge pull request #2737 from rightscale/gce_launch_instance_ruby18

[google|compute] disk model: get_object fix for Ruby 1.8
Merge pull request #2733 from brettporter/gce-service-accounts

[google|compute] ability to supply serviceAccounts on image create
Merge pull request #2533 from kbockmanrs/gce_image_scope

[google|compute] auth needs additional scope to insert images into GCS
Allow dnsimple authentication via API tokens
[Brightbox] Don't set generic names in tests

To see updates are happening, the tests originally reset the names to
values from fog. However this messes up the names for any other purposes
such as telling one fog test account apart from another.

This sets the values back to the original value.
[Brightbox] Fix SQL instance waiting in tests

API changed to prevent deleting an server whilst snapshots are occurring
but the test was waiting in the wrong place for the wrong thing.

Seems e78d096 did not correctly solve the problem when requests are
being tested.
Merge pull request #2741 from brightbox/brightbox_updates

Brightbox test updates
Merge pull request #2739 from chrisroberts/feature/dnsimple-tokenauth

Allow dnsimple authentication via API tokens
Merge pull request #2722 from abenari/docker

[Docker] attribute aliases fixed