fix build to work for EC2 environment by default, SoftLayer changes for Eureka comments out for now