Xenial already has this pending from upstream stable. For Zesty and Yakkety the fix can be cherry-picked. For Trusty I had to take the version from 4.4.y and fix up one hunk (which renamed a stack variable) as it did not apply. -Stefan