Merge back 10.5.0 20200703

[phil-davis]

Description

Merge back the current diffs between release-10.5.0 and master to master

Then we can delete the release-10.5.0 branch that was used for making 10.5.0RC3 and when we are ready we can branch again from master1 before creating RC4.

This will allow us to easily include various stuff like Transifex translation commits that are in master and would otherwise need to be backported...

To make this PR I did:

git fetch origin
git checkout master
git pull
git checkout release-10.5.0
git pull
git checkout -b merge-back-10.5.0-20200703
git rebase master
First, rewinding head to replay your work on top of it...
Applying: Prepare 10.5.0 changelog
Applying: Bump version in version.php
Applying: Update icewind/smb v3.2.4 and other files_external/3rdparty dependencies
Applying: Bump icewind/smb 3.2.5 and google/apiclient 2.5.0
Applying: Updating google/apiclient-services (v0.138 => v0.139) in apps/files_external/3rdparty
Applying: Bump version in version.php

And it happily did the rebase without any conflicts, and ended up with just a reasonable set of commits that are the things from release-10.5.0 that are not already in master. i.e. the icewind/smb version bumps, ownCloud changelog, and ownCloud RC version bumps.

2020-07-06PM - rebased to latest master and added the commits from the new tip of release-10.5.0 (from PR #37654

How Has This Been Tested?

CI

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Database schema changes (next release will require increase of minor version instead of patch)
• Breaking change (fix or feature that would cause existing functionality to change)
• Technical debt
• Tests only (no source changes)

Checklist:

• Code changes
• Unit tests added
• Acceptance tests added
• Documentation ticket raised:
• Changelog item, see TEMPLATE

[codecov]

Codecov Report

Merging #37648 into master will increase coverage by 0.00%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #37648   +/-   ##
=========================================
  Coverage     64.74%   64.74%           
- Complexity    19360    19363    +3     
=========================================
  Files          1281     1281           
  Lines         75622    75628    +6     
  Branches       1333     1333           
=========================================
+ Hits          48959    48966    +7     
+ Misses        26271    26270    -1     
  Partials        392      392           

Flag	Coverage Δ	Complexity Δ
#javascript	54.03% <ø> (ø)	0.00 <ø> (ø)
#phpunit	65.93% <ø> (+<0.01%)	19363.00 <ø> (+3.00)

Impacted Files	Coverage Δ	Complexity Δ
lib/private/legacy/util.php	74.95% <0.00%> (+0.42%)	222.00% <0.00%> (+3.00%)

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9687d77...3641f1d. Read the comment docs.

[phil-davis]

@micbar merge-back is ready if you would like to do that.

[phil-davis]

@micbar do this merge-back?

[micbar]

@phil-davis We need to merge the other branch.
There were additions to the branch.

[phil-davis]

@micbar I updated this branch already from the latest on release-10.5.0 branch, including the commits from #37654

[phil-davis]

@phil-davis We need to merge the other branch.
There were additions to the branch.

Note: release-10.5.0 does not merge "automagically", GitHub claims that there are conflicts. We have to do something like this to merge the content (or someone with privs has to do a rebase of release-10.5.0 and force-push it, which seems more risky to me)

[phil-davis]

@micbar I rebased to get fresh CI against latest master.
Are we going ahead and doing this?
Please review.