Merge branch 'master' into services-r7

Conflicts:
	cloud_controller/Gemfile
	cloud_controller/Gemfile.lock
	dea/Gemfile.lock
	dea/vendor/cache/vcap_common-1.0.3.gem
	health_manager/Gemfile
	health_manager/Gemfile.lock
	health_manager/vendor/cache/vcap_common-1.0.3.gem
	package_cache/vendor/cache/vcap_common-1.0.3.gem
	router/Gemfile.lock
	stager/Gemfile.lock
	staging/Gemfile.lock
	staging/vendor/cache/vcap_common-1.0.3.gem

Change-Id: I58bb9fa584811e65e3f64189ab7110449d3ce139

Gemfile

@@ -2,12 +2,13 @@ source "http://rubygems.org"
 
 gem 'bundler', '>= 1.0.10'
 gem 'rake'
-gem 'nats', '>= 0.4.10', :require => 'nats/client'
-gem 'eventmachine',  '~> 0.12.11.cloudfoundry.2'
-gem "http_parser.rb",  :require => "http/parser"
+gem 'nats', :require => 'nats/client'
+gem 'eventmachine'
+
+gem "http_parser.rb", :require => "http/parser"
 gem "yajl-ruby", :require => ["yajl", "yajl/json_gem"]
 
-gem 'vcap_common'
+gem 'vcap_common', '~> 1.0.3'
 gem 'vcap_logging', :require => ['vcap/logging']
 
 group :test do

Gemfile.lock

@@ -4,20 +4,21 @@ GEM
     builder (3.0.0)
     ci_reporter (1.6.4)
       builder (>= 2.1.2)
-    daemons (1.1.4)
+    daemons (1.1.5)
     diff-lcs (1.1.2)
     eventmachine (0.12.11.cloudfoundry.3)
     http_parser.rb (0.5.1)
-    json_pure (1.6.3)
+    json_pure (1.6.4)
     little-plugger (1.1.3)
     logging (1.6.1)
       little-plugger (>= 1.1.2)
-    nats (0.4.10)
-      daemons (>= 1.1.0)
+    nats (0.4.22.beta.4)
+      daemons (>= 1.1.4)
       eventmachine (>= 0.12.10)
-      json_pure (>= 1.5.1)
+      json_pure (>= 1.6.1)
+      thin (>= 1.3.1)
     posix-spawn (0.3.6)
-    rack (1.3.5)
+    rack (1.4.0)
     rake (0.8.7)
     rcov (0.9.9)
     rspec (2.5.0)
@@ -28,16 +29,16 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    thin (1.2.11)
+    thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    vcap_common (1.0.2)
+    vcap_common (1.0.3)
       eventmachine (~> 0.12.11.cloudfoundry.3)
       logging (>= 1.5.0)
-      nats (~> 0.4.10)
+      nats (~> 0.4.22.beta.4)
       posix-spawn (~> 0.3.6)
-      thin (~> 1.2.11)
+      thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
     vcap_logging (0.1.3)
     yajl-ruby (0.8.3)
@@ -48,12 +49,12 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.10)
   ci_reporter
-  eventmachine (~> 0.12.11.cloudfoundry.2)
+  eventmachine
   http_parser.rb
-  nats (>= 0.4.10)
+  nats
   rake
   rcov
   rspec
-  vcap_common
+  vcap_common (~> 1.0.3)
   vcap_logging
   yajl-ruby