Move ports around to allow master/server to coexist (#962).