[general] Allow default wait_for interval to be overiden globally.
Merge remote-tracking branch 'upstream/master'
vApp rename via put_vapp_name_and_description
use std options={} format for optional parameters
Find all and by-name Mock for Query API orgVdcNetwork

* Just for OrgVdcNetwork for now
* Be clear about what options/queries are unimplemented
* Expand tests to cover mocks
* comment to explain gnarly test logic
* :page=1 results handled
improve network mock test data, to include vdc & IsShared
fix tests for running against live environment
make Mock vcloud_director_host an FQDN
[vclouddirector] Shore up tests re EdgeGateway

ruby 1.8.7 highlighted tests fail if first vdc does not have an edge gateway
rename Mock vcloud_director_host to pass URI.parse
[general] Merge Forg.interval and Fog.timeout into a single file.
Update S3 ACL whitelist
[core] use Excon :persistent option
[vclouddirector] correct put_vapp_name_and_description documentation
Merge pull request #2481 from alphagov/vcloud_director_put_vapp

vApp rename via put_vapp_name_and_description
Merge pull request #2478 from alphagov/vcloud_director_get_execute_query_mock

Vcloud director get execute query mock
Merge pull request #2482 from burns/excon_persistent

use Excon :persistent option
Merge pull request #2477 from Technicolor-Portico/master

[general] Allow default wait_for interval to be overriden globally.
Merge pull request #2483 from kbarrette/update_s3_acl_whitelist

Update S3 ACL whitelist
streamline openstack security groups tests

Hoping this will fix (or at least make clearer) intermitent travis fails