Merge pull request #20633 from QuintinHill/python-mqtt