Don't add bucket name to the capi endpoint in config

When building the config we take the capi endpoints and the bucket name to them. This means that later we have to strip it off in the diagnostics component. We should add the bucket name at the point that we need the endpoint to have the bucket name (i.e. views requests)