Merge pull request #12203 from wtgodbe/Timing
authorWilliam Godbe <wigodbe@microsoft.com>
Fri, 16 Jun 2017 18:45:54 +0000 (11:45 -0700)
committerGitHub <noreply@github.com>
Fri, 16 Jun 2017 18:45:54 +0000 (11:45 -0700)
Fix timing issues in some baseservices tests


Trivial merge