Merge pull request #4376 from kumpera/test-hardneing
authorRodrigo Kumpera <kumpera@users.noreply.github.com>
Thu, 16 Feb 2017 09:01:33 +0000 (01:01 -0800)
committerGitHub <noreply@github.com>
Thu, 16 Feb 2017 09:01:33 +0000 (01:01 -0800)
Disable some flaky tests and harden another one.


Trivial merge