Remove old logic from oo-admin-upgrade
Admin script cleanup
Merge pull request #3248 from danmcp/master

Merged by openshift-bot