Merge changes from EC2 automated build testing.