Fix get_emi defaults

Change-Id: I4d7616141ff9b2a3fccd0e4d9fa00cccacf35791
Add tags to ec2.robot

Change-Id: Ia39573536ab93ae6d12f30f3c8f4259d289afc7a
No default credpath

Change-Id: Ib29066c6f898e3c5d91b40c13ac11e13603add76
Merge branch 'maint/4.0/testing' into testing
Added HEAD object test
Merge pull request #297 from euca-nightfury/maint/4.0/testing

Added HEAD object test
Adds presigned url tests for each verb and for sts tokens

Conflicts:
	testcases/cloud_user/s3/object_tests.py
Adds S3 POST upload test using STS credentials
Merge branch 'query_auth_4.0' of https://github.com/zhill/eutester into zhill-query_auth_4.0

Conflicts:
	testcases/cloud_user/s3/object_tests.py
Merge branch 'zhill-query_auth_4.0' into maint/4.0/testing
Merge branch 'zhill-s3_query_auth_url' into testing
Increase max scsi device count for instances
Add descriptions when for canned show commands
Add additional checks for dd process outcome, and error reporting
Fetch a 'basic image' for block device map tests
Riak install script updates
Merge branch 'testing' of git.qa1.eucalyptus-systems.com:qa-repos/eutester into testing
Merge branch 'testing' of https://github.com/eucalyptus/eutester into testing
Update instance_tests to use run_image. Allow run image to return reservation
Use cmd status instead of parsed output for wait's status