Adding support to configure webhook_timeout

Conflicts:
	CHANGELOG
Merge remote-tracking branch 'upstream/master' into webhook-timeout
Merge branch 'webhook-timeout'

Conflicts:
	CHANGELOG