Merge branch 'master' into 15531-logincluster-migrate

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --cc doc/_config.yml
index 314b5b5cd3230eb89c2423827cb8a1b120c6a4a3,c4fad997f17afb31327a17e8a38695f22a701934..0ae26584e855c18b2d6ad9a058deadff63e784e3
--- 1/doc/_config.yml
--- 2/doc/_config.yml
+++ b/doc/_config.yml
@@@ -150,8 -150,6 +150,7 @@@ navbar
        - admin/index.html.textile.liquid
      - Configuration:
        - admin/config.html.textile.liquid
-       - admin/collection-managed-properties.html.textile.liquid
 +      - admin/federation.html.textile.liquid
      - Upgrading and migrations:
        - admin/upgrading.html.textile.liquid
        - admin/config-migration.html.textile.liquid
@@@ -171,12 -171,13 +170,16 @@@
        - admin/cloudtest.html.textile.liquid
      - Data Management:
        - admin/collection-versioning.html.textile.liquid
+       - admin/collection-managed-properties.html.textile.liquid
+       - admin/keep-balance.html.textile.liquid
+     - Other:
+       - admin/federation.html.textile.liquid
        - admin/controlling-container-reuse.html.textile.liquid
        - admin/logs-table-management.html.textile.liquid
 +    - Other:
        - admin/troubleshooting.html.textile.liquid
 +      - install/migrate-docker19.html.textile.liquid
 +      - admin/upgrade-crunch2.html.textile.liquid
    installguide:
      - Overview:
        - install/index.html.textile.liquid