* commit '7a640a093639c712ed4e37d06cb86c50d88bd376': Revert "Use port 18000 instead of 8000 for layout tests"