Bump versions of linux headers in trusty OS image test

Signed-off-by: Maria Shaldibina <mshaldibina@pivotal.io>

Conflicts:
	bosh-stemcell/spec/os_image/ubuntu_trusty_spec.rb
Update bosh-agent

This includes a cherry-pick of a807749, which is an update to a timebomb
test.

Signed-off-by: Maria Shaldibina <mshaldibina@pivotal.io>
Update bosh_vcloud_cpi gem to 0.7.0

Fix test errors in BAT network_configuration_spec
Merge branch 'vchs-2690.3_vcloud' into 2690.4
Remove bosh_vcloud_cpi-0.5.5.gem from vendor/cache

Signed-off-by: Karl Isenberg <kisenberg@pivotal.io>
Merge branch '2690.4' into develop

Signed-off-by: Karl Isenberg <kisenberg@pivotal.io>

Conflicts:
	Gemfile.lock
	bosh-director/bosh-director.gemspec
	bosh_cli_plugin_micro/bosh_cli_plugin_micro.gemspec
	go/src/github.com/cloudfoundry/bosh-agent