Merging setting cert differently for fallback proxies fixes closes #740