Fixing Problems with ClassCast Exception - TRUNK-4053(cherry picked from commit 1850c17f0d1cb437ee26ff9d0dde9cc1b1c1d706)
First attempt at fixing failures which do not happen locally, but only
on bamboo
Putting on hold the fix for: Problems with ClassCast Exception -
TRUNK-4053