updated timeout:
    <surefire.timeout>7200</surefire.timeout>
Merge remote-tracking branch 'origin/0.94-gd' into 0.94-gd