[TO_STAGE] remove old upgrade logic

Port to stage what was merged in master here:
https://github.com/openshift/origin-server/pull/5931