Merge branch 'master' into '46448-add-timestamps-for-each-stage-of-gitlab-rake-gitlab-backup-restore'

# Conflicts:
#   spec/tasks/gitlab/backup_rake_spec.rb