Merge branch 'master' into 5.0.x
Merge branch 'master' into 5.0.x
Merge branch 'master' into 5.0.x

Conflicts:
	CHANGES
	proxy/http/HttpSM.cc
	proxy/http/HttpTransactCache.cc
	proxy/http/HttpTransactCache.h
Merge branch 'master' into 5.0.x
Merge branch 'master' into 5.0.x

Conflicts:
	CHANGES
	iocore/cache/CacheRead.cc
Fix merge conflict
Merge branch 'master' into 5.0.x
TS-1919 Backing this change out, since it's been -1'd.

git revert did not handle this nicely, since the trees have
diverged so much. Instead, I simply made 5.0.x identical to
current "master".
TS-2088: Change TSRecordType enum values to powers of two
Merge branch 'master' into 5.0.x

* master: (69 commits)
TS-2290 Remove X-ID special log tag, and cleanup HdrToken confusion
Merge branch 'master' into 5.0.x

* master: (25 commits)
Merge branch 'TS-2290' into 5.0.x
  TS-2290 Remove X-ID special log tag, and cleanup HdrToken confusion
ADded TS-2290 to CHANGES.
Merge branch 'master' into 5.0.x
TS-2229 header_filter should be deprecated, header_rewrite is a superset of functionality
TS-2195 Remove the (deprecated) TSHttpTxnCacheLookupSkip API
Remove unused ServerState_t string mapping
Update STATUS file
Merge branch 'master' into 5.0.x

Conflicts:
	doc/reference/plugins/header_filter.en.rst