AUTO-606: Having all server logs bound to server_id instead of instance_id
Merge pull request #492 from rackerlabs/auto-606-server_id

AUTO-606: Having all server logs bound to `server_id`
AUTO-837: Launch failures logged as errors
Merge pull request #495 from rackerlabs/auto-837-job-error

AUTO-837: Launch failures logged as errors
shorter - thanks @cyli
Merge pull request #496 from rackerlabs/retry_times

retry_times implemented
add_to_load_balancer tests updated - working
Merge branch 'master' into lb_wait_active
log and tests fix
some refactor and additions for add_to_lb tests
remove_from_load_balancer tests implemented