updated branch to use aws nexus (cherry picked from commit 4caa833)