api: append EC2 to related environment vars, so it they won't mix up with S3 stuff
api: fixed wrong mock return value