reverted 'trying to include org.apache.hadoop.hbase.IntegrationTests as part of <surefire.firstPartGroups>'
updated timeout:
    <surefire.timeout>1800</surefire.timeout>
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-311-trunk-gd