[vsphere|compute] cleanup merge conflicts with clone method
Assign service to clone_result before new instance of vm
Add EnableLogging field to FirewallService XML
aws/compute: Hotfix, wrong Name argument for copy_image
Merge pull request #2321 from alphagov/firewall_enable_logging

[vcloud_director] Add EnableLogging field to FirewallService XML
Merge pull request #1740 from aussielunix/vsphere-clone-conflicts

[vsphere|compute] cleanup merge conflicts with clone method
Merge pull request #1772 from xfontroSF/vsphere_fix_service

[Vsphere|compute] Assign service to clone_result before new instance of vm
[vsphere|compute] Small code cleanup.
Merge pull request #2323 from zimbatm/fix/copy_image

aws/compute: Hotfix, wrong Name argument for copy_image
Auto-merge remote-tracking branch 'upstream/master'