Address intermittent AtomJMSIT test errors

Follow-on to https://www.pivotaltracker.com/story/show/58726512