Fix upstream_bundle configurable

[evan2645]

#391 introduced a new configurable called upstream_bundle, which instructs the server to include the upstream CA certificates in the trust domain's bundle. Problem is, it doesn't actually do that :). Ensure that the upstream CA is actually distributed in the bundle when the configurable is set.

[evan2645]

@martincapello you were asking about this recently