Bug 18887: (QA follow-up) Remove last occurences of old max_holds