UPSTREAM: Take HandlerContainer as input to master to allow extension

Also allow swagger to be optionally enabled, so we can define our own
Support the swagger API from OpenShift master

Depends on changes to upstream