Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-01

Gemfile.lock

@@ -365,7 +365,7 @@ GEM
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    google-protobuf (3.5.1.1-universal-darwin)
+    google-protobuf (3.5.1.1)
     googleapis-common-protos-types (1.0.1)
       google-protobuf (~> 3.0)
     googleauth (0.5.3)
@@ -394,7 +394,7 @@ GEM
       rake
     grape_logging (1.7.0)
       grape
-    grpc (1.8.3-universal-darwin)
+    grpc (1.8.3)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
       googleauth (>= 0.5.1, < 0.7)