Increase the wait time.
Fix the waits.
Cleanup.
Fix the waits. Still getting 500's for some reason.
Fix the waits.
Fix the wait.
Merge pull request #842 from rackerlabs/B-62422-part-deux

B 62422 part deux