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

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