Added multi-instance support to Elasticsearch collector, minor unittest fixes

Change-Id: I26be1da78a2d52747d4ee959a1c00676e948e43d
Merge pull request #714 from rtoma/es-multi

Added multi-instance support to Elasticsearch collector, minor unittest fixes