Undoing mq retry, adding better startup/shutdown gracefulness