Bug 889939
Merge branch 'features/model_refactor' of github.com:kraman/origin-server into model_refactor