TS-2805: Client connections are connecting with SPDY 3 instead of 3.1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

Conflicts:
	CHANGES