Merge "Move elasticsearch scheme to defaults"