Merge remote-tracking branch 'upstream/6-8-stable' into ldap-filter

    Conflicts:
        Gemfile
        Gemfile.lock
        VERSION
        doc/install/installation.md
        doc/update/6.2-to-6.3.md
        lib/support/nginx/gitlab