Merge "Upgrade ELK to 6.1.3"