Issue 3584 upgrade to the latest elastic search