[crux-commits] ports/opt (3.3): python-setuptools: fix merge form opt/3.2