Merge "Migrate ELK to 6.1.3 OSS"