updated branch to use aws nexus (cherry picked from commit 4caa833)
Merge remote branch 'origin/branch-2-gd' into fb-YAHOO-218-branch-2-gd