TRUNK-4143 Fixing build