Project: springxd
Issue XD-2558: Fix test failures and hangs on various local builds
The scope is to use this as a bucket for any local test failures. Let's have them accounted in this story and fix as applicable.
Story points: 5