brought over the changes from df91300babd3d1d3 to 58ccc2985ba30ae244aa8efcc2d989879e659b34 (latest commit on es/kibana:master). Summary in the roots df9...diff