Merge pull request #1971 from SuminAndrew/remove-with_statement

remove redundant with_statement feature

diff --cc tornado/httpserver.py
Simple merge

diff --cc tornado/log.py
Simple merge