Zesty and Yakkety can do a cherry-pick, Xenial needs minor adaption (ignore top context fuzz), Trusty required manual placement of the new code as no context was matching. -Stefan