Update elasticsearch to 1.4.1

Same as #34503 but rebased