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
Merge pull request #1798 from smarterclayton/update_to_new_plan_values

Merged by openshift-bot