Merge remote-tracking branch 'origin/pr/2816' into mbedtls-2.7

* origin/pr/2816:
  ssl-opt.sh: wait for proxy to start before running the script further