Merge "Use static filenames for elasticsearch logs" into release/2019.2.0