missing service_name tag plugin: show the service_type of the machine instead of the instance id
tests fixed
edda race condition "fix" attempt
use ami as service_type if nothin else