updated branch to use aws nexus
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-217-trunk-gd