fix NPE in genMessage of FailedShardsException

shardFailure can be null
update es/upstream for memory consumption improvement

Conflicts:
	CHANGES.txt