Bug 989856 - fix for embedded carts
fix bz990341
WIP Node Platform - Restored env_var_subscription_steps.rb

* Refactored upgrade_steps.rb broke env_var_subscription_steps.rb
Bug 988410 - Allow the userdel to safely fail if the user is already gone.
Merge pull request #3247 from lnader/master

Merged by openshift-bot
Merge pull request #3245 from rajatchopra/master

Merged by openshift-bot
Merge pull request #3250 from jwhonce/wip/extended_tests

Merged by openshift-bot
Merge pull request #3251 from rmillner/BZ988410

Merged by openshift-bot
Remove old logic from oo-admin-upgrade
Admin script cleanup