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