[releng] PR #8573: F31 ftbfs changes and changing shebangs to py3