Seth, I have incorporated your review comments: changed cherry-picked to backported, removed the spurious changes introduced by vim and unrelated changes made by me. Please review and consider this version of the patch for Zesty.