[sr-dev] How to cherry-pick from master to 4.4 since file paths have changed

[Lucian Balaceanu]

Hi guys,

I would like to port my latest master commit to the 4.4 branch.
Since the path to the modules have changed I can no longer do a simple 
`git cherry-pick -x ...`.

What is the accepted way to backport changes to 4.4? Maybe something 
using the `git cherry-pick --strategy ...` ?

Thank you,
Lucian