remove extra include in elasticsearch
Merge branch 'stage'
Merge branch 'master' into stage