Bug 822817: Add /b/ proxy for telemetry redirect.
Bug 683375: Add research site /b/ proxy and redirect.
Merge branch 'bug-614428-add-research-site-b-proxy'

Conflicts:
	etc/httpd/global.conf