Updates for lastest elasticsearch changes in master

Consistent "score mode" for nested/parent-child queries and filters.
Update internal sctructure of SpanMultiTermQuery.