CMS-4596 Upgrade ES to 1.3.6