Revert changes to swigversion generation
Merge branch 'johanhake/python3-fixes' into next