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
openshift-origin-cartridge-cron: stop the cartridge only if started during a restart
Card origin_runtime_228 - Update PHP My Admin cartridge
Updated broker/docs for the phpmyadmin-4
Updated cartridges and scripts for phpmyadmin-4
Merge pull request #3517 from mmahut/mmahut/cron_control_restart

Merged by openshift-bot
Merge pull request #3374 from mfojtik/trello/228-update-php-my-admin-cartridge

Merged by openshift-bot
cleanup