Removing @SkipBaseSetup which was making some unit tests fail -
TRUNK-4134