QPID-5306: Improve test wrapper to avoid using getopt for long options
  Using getopt with long options is a gnu extension and so best avoided
  for portability reasons.
QPID-5330: Typo in original checkin