omelasticsearch: straighten out statistics counters

Conflicts:

	plugins/omelasticsearch/omelasticsearch.c
bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled

Thanks to Jonny Törnbom for reporting this problem

Conflicts:

	ChangeLog
	runtime/cryprov.h
Merge branch 'v7-stable'

Conflicts:
	plugins/omelasticsearch/omelasticsearch.c
	runtime/cryprov.h