fix for #60
fixed compilation errors
Merge branch 'master' into config_endpoints
log which endpoint controller we use
Merge pull request #63 from mesosphere/config_endpoints

add hostPortEndpoints flag
Merge branch 'master' into scheduler_backoff