Upgrade: Drop the upgrade machinery for pre 2.6.0

This can be safely dropped since we no longer support direct upgrades
from versions older than 2.6.0.

Also minor cleanup on initdb to simplify the code.