Add omitted time.Millisecond duration to ES output's http timeout
calculation (thanks @validname).
Merge branch 'versions/0.7' into fix_elasticsearch_timeout

Conflicts:
	CHANGES.txt
Merge pull request #1086 from mozilla-services/fix_elasticsearch_timeout

Fix elasticsearch timeout