svn merge -c 1357994 from branch-1 for HDFS-6527. Backport HADOOP-7389: Use of TestingGroups by tests causes subsequent tests to fail.