Removed reference to non-existent '@default_upstream'.

This also implements merging of the 'upstream_servers' setting.