GOLD-639: Unit test failures down to 3, 2.
GOLD-639: Unit test failures down to 3, 2.

slashk/goldstone-server,Solinea/goldstone-server,slashk/goldstone-server,Solinea/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,slashk/goldstone-server,Solinea/goldstone-server