misc: remove duplicate import in oo-trap-user
Upgrade fix for warning handling
Merge pull request #3512 from ironcladlou/dev/upgrader-fixes

Merged by openshift-bot
Merge pull request #3509 from mmahut/mmahut/duplicate_import

Merged by openshift-bot
<docs puppet deploy> RHEL puppets deps; post-install notes
Merge pull request #3515 from sosiouxme/origin-docs

Merged by openshift-bot