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

Merged by openshift-bot
Bug 1028576 - EtcUtils should be explicitly required by the selinux module if its going to be used.
Merge pull request #4145 from rmillner/BZ1028576_stg

Merged by openshift-bot