Fix test to generate events and handle time

(cherry picked from commit 21c898799b2f470e10eb37b8781189dee19032d3)

Conflicts:
	acceptance/helper.rb
	acceptance/tests/reports/report_query_by_timestamp.rb
Add Accept: application/json headers for the 1.3.x backport of this patch

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #658 from kbarber/maint/1.3.x/backport-report-query-fix

Maint/1.3.x/backport report query fix
Merge branch '1.3.x' into 1.4.x

* 1.3.x:
  Add Accept: application/json headers for the 1.3.x backport of this patch
  Fix test to generate events and handle time

Conflicts:
	acceptance/helper.rb
	acceptance/tests/reports/report_query_by_timestamp.rb