Fix elasticsearch status
Merge branch 'pw-cloudformation'