fix #627: Merge SPDY settings when clear flag set. Revert Settings.DEFAULT_INITIAL_WINDOW_SIZE.
Merge pull request #631 from square/okhttp_15_jwilson_spdy_window_changes

fix #627: Merge SPDY settings when clear flag set.