Cherry pick ' Update ELASTIC_PORT' into 'release/0.13'

Original MR: !485 (merged)

Merge request reports

Loading