Applied to xenial/master-next branch, replacing the line "(cherry-picked from...)" by "(backported from ...)" since the submitted patch was a backport and not a cherry pick, and fixing the authorship and the subject line. Thanks.