Merge remote-tracking branch 'public/pr/1217' into mbedtls-1.3

* public/pr/1217:
  compat.sh: use wait_server_start
  wait_server_start: minor efficiency improvement