Fix bug 1028518: include prior upgrade attempts in oo-admin-upgrade output
Merge pull request #4137 from pmorie/bugs/1028518

Merged by openshift-bot