In order to allow openshift to use (but also override pieces of) our incremental deployment, we must liberalize a few methods from private to protected, and add a few superclasses for extending to avoid code duplication.