Merge "Further py2 cleanup for Fedora"