Merge MAX-157 into simplereply, also changed the way timestamps are replresented.
Merge branch 'simplereply' into rabbitmq_consumer

Conflicts:
	server/modules/filter/Makefile