Merge pull request #15830 from jefferyto/python-zope-interface-5.4.0