Merge branch 'stable-5.0'

* stable-5.0:

Empty merge. The stable-4.9 branch was merged directly into stable-5.0
by [1], and then there were separate merges up through stable-4.10 to
stable-4.11 by [2] and [3].

When stable-4.11 was merged in to stable-5.0 in [4] it was an empty
merge, since the change had already been brought in by [1].

[1] https://git.eclipse.org/r/#/c/124301/-1..2
[2] https://git.eclipse.org/r/#/c/124320/-1..1
[3] https://git.eclipse.org/r/#/c/124321/-1..1
[4] https://git.eclipse.org/r/#/c/124332/-1..1

Change-Id: I91304b1bdad41837814d221971750b2b64bdcf6a
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>