Merge branch 'master' into 15572-new-install-docs

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --combined doc/install/index.html.textile.liquid
index fd151146898dafdf154f778e931aa0a0c80a73fb,527b62cf3b4224491e72eccc358c67326842eec5..efa671db8c26b8d01f96cad310f3e973d993213d
--- 1/doc/install/index.html.textile.liquid
--- 2/doc/install/index.html.textile.liquid
+++ b/doc/install/index.html.textile.liquid
@@@ -9,7 -9,7 +9,7 @@@ Copyright (C) The Arvados Authors. All 
  SPDX-License-Identifier: CC-BY-SA-3.0
  {% endcomment %}
  
- Arvados components run on GNU/Linux systems, and supports AWS and Azure cloud platforms as well as on-premises installs.  Arvados supports Debian and derivatives such as Ubuntu, as well as Red Hat and derivatives such as CentOS.  Although Arvados development is sponsored by Veritas Genetics which offers commercial support, "Arvados is Free Software":{{site.baseurl}}/copying/copying.html and we encourage self supported/community supported installations.
 -Arvados components run on GNU/Linux systems, and supports multiple cloud operating stacks.  Arvados supports Debian and derivatives such as Ubuntu, as well as Red Hat and derivatives such as CentOS.  "Arvados is Free Software":{{site.baseurl}}/copying/copying.html and self-install installations are not limited in any way.  Commercial support and development are also available from "Curii Corporation.":mailto:info@curii.com
++Arvados components run on GNU/Linux systems, and supports AWS, GCP and Azure cloud platforms as well as on-premises installs.  Arvados supports Debian and derivatives such as Ubuntu, as well as Red Hat and derivatives such as CentOS.  "Arvados is Free Software":{{site.baseurl}}/copying/copying.html and self-install installations are not limited in any way.  Commercial support and development are also available from "Curii Corporation.":mailto:info@curii.com
  
  Arvados components can be installed and configured in a number of different ways.
  
@@@ -19,11 -19,10 +19,10 @@@ table(table table-bordered table-conden
  ||_. Ease of setup|_. Multiuser/networked access|_. Workflow Development and Testing|_. Large Scale Production|_. Development of Arvados|_. Arvados System Testing|
  |"Arvados-in-a-box":arvbox.html (arvbox)|Easy|no|yes|no|yes|yes|
  |"Arvados on Kubernetes":arvados-on-kubernetes.html|Easy ^1^|yes|yes ^2^|no ^2^|no|yes|
- |"Manual installation":install-manual-prerequisites.html|Medium|yes|yes|yes|no|no|
- |"Arvados Playground":https://playground.arvados.org hosted by Veritas Genetics|N/A ^3^|yes|yes|no|no|no|
- |"Cluster Operation Subscription":https://curoverse.com/products supported by Veritas Genetics|N/A ^3^|yes|yes|yes|yes|yes|
+ |"Manual installation":install-manual-prerequisites.html|Complicated|yes|yes|yes|no|no|
+ |"Cluster Operation Subscription supported by Curii":mailto:info@curii.com|N/A ^3^|yes|yes|yes|yes|yes|
  </div>
  
  * ^1^ Assumes a Kubernetes cluster is available
  * ^2^ Arvados on Kubernetes is under development and not yet ready for production use
- * ^3^ No installation necessary, Veritas Genetics run and managed
+ * ^3^ No user installation necessary, Curii run and managed

diff --combined services/login-sync/Gemfile.lock
index 5f163e87c32188e04ac4a05573ad9d922f185a07,5f163e87c32188e04ac4a05573ad9d922f185a07..1d89604ae104bd30fe0db69546e2d0cec906f53b
--- 1/services/login-sync/Gemfile.lock
--- 2/services/login-sync/Gemfile.lock
+++ b/services/login-sync/Gemfile.lock
@@@ -1,7 -1,7 +1,7 @@@
  PATH
    remote: .
    specs:
--    arvados-login-sync (1.4.1.20190930204434)
++    arvados-login-sync (1.3.1.pre20191210204053)
        arvados (~> 1.3.0, >= 1.3.0)
        faraday (< 0.16)
  
@@@ -23,7 -23,7 +23,7 @@@ GE
        i18n (~> 0)
        json (>= 1.7.7, < 3)
        jwt (>= 0.1.5, < 2)
--    arvados-google-api-client (0.8.7.2)
++    arvados-google-api-client (0.8.7.3)
        activesupport (>= 3.2, < 5.1)
        addressable (~> 2.3)
        autoparse (~> 0.3)
@@@ -60,7 -60,7 +60,7 @@@
      minitest (5.11.3)
      mocha (1.8.0)
        metaclass (~> 0.0.1)
--    multi_json (1.13.1)
++    multi_json (1.14.1)
      multipart-post (2.1.1)
      os (1.0.1)
      public_suffix (4.0.1)
@@@ -85,4 -85,4 +85,4 @@@ DEPENDENCIE
    rake
  
  BUNDLED WITH
--   1.17.3
++   2.0.2