updated timeout:
    <surefire.timeout>1800</surefire.timeout>
Merge remote branch 'origin/0.95-gd' into fb-YAHOO-317-0.95-gd