[Zope] Collector status on password change bug?

I see that the "Can't change User Roles without their Password" bug mentioned in: http://classic.zope.org:8080/Collector/1102/view http://classic.zope.org:8080/Collector/1134/view http://classic.zope.org:8080/Collector/1138/view (etc) is still in 2.1.6 http://classic.zope.org:8080/Collector/1138/view provides a patch. What is the recommended way to solve this long-standing problem?