Merge partner specific configuration with server configuration