Merge "Use port 18000 instead of 8000 for layout tests"