changed maven surefire plugin version to 2.16 to avoid problems with forkMode=once in submodule projects.
Merge remote branch 'origin/branch-2-gd' into fb-YAHOO-225-branch-2-gd