s4:upgrade.py - rework to make the upgrade s3 -> s4 possible again