Fix unit tests.  Bump down timeout for AWS authentication test
Merge pull request #973 from eucalyptus/fix_tests

Fix unit tests.  Bump down timeout for AWS authentication test