minor changes due to changed constructor of HashedBytesArray; elasticsearch 0.90.2 compatibility
Merge branch 'master' into es-0-90-2

Conflicts:
	CHANGES.txt