Fixed proxy etc merger issue from master to serf-dev and docker machine link issue