MegaShift => Silver
Merge remote-tracking branch 'origin/master' into update_to_new_plan_values
Remove references to plans from origin-server
Merge remote-tracking branch 'origin/master' into update_to_new_plan_values
Removing oo-setup-* scripts as they have been replaced by puppet and ansible modules.
Updating puppet setup docs
WIP Cartridge Refactor - Roll out old threaddump support

* New manifest-driven documented
* Any threaddump call on un-supported cartridges will return success
Corrected the incorrect fix put in for bug 915673
updated unit test
Merge pull request #1798 from smarterclayton/update_to_new_plan_values

Merged by openshift-bot
Merge pull request #1821 from jwhonce/wip/threaddump

Merged by openshift-bot
Merge pull request #1777 from kraman/remove_oo_scripts

Merged by openshift-bot
Merge pull request #1815 from lnader/master

Merged by openshift-bot