Merge branch 'develop' into 5.8-dev

# Conflicts:
#	composer.lock

config/database.php

@@ -159,6 +159,7 @@ return [
             'path'     => envNonEmpty('REDIS_PATH'),
             'host'     => envNonEmpty('REDIS_HOST', '127.0.0.1'),
             'port'     => envNonEmpty('REDIS_PORT', 6379),
+            'username' => env('REDIS_USERNAME'),
             'password' => env('REDIS_PASSWORD', null),
             'database' => env('REDIS_CACHE_DB', '1'),
         ],