Don't wait for close if the JmsConnection never got started in the first
place, we won't have a connection instance in this case.
Merge branch 'master' into amqp-only