CloudUser.with_plan scope added for rhc-admin-ctl-plan
Merge branch 'features/model_refactor' of github.com:kraman/origin-server into features/model_refactor