Bp 968

[yjacolin]

No description provided.

[DelazJ]

git checkout release_2.18
git pull upstream release_2.18 # or whatever commands ensure that your branch is up to date with upstream
git cherry-pick the_commits_from_master_branch
git push upstream release_2.18

and you skip the new PR step

[yjacolin]

Actually I prefer the PR step as I am sure that I don't forget anything (conflicts) and build are working correctly. I know that it should work but ...