svn merge -c -1448745 and -1448285 for reverting HADOOP-9112: test-patch should -1 for @Tests without a timeout