Merge remote-tracking branch 'origin/pr/2817' into mbedtls-2.16

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