increased test Xmx 1900m -> 2400m
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-311-trunk-gd