Merge e3c5d1d55a07d9cb152e5d69d7584cb7131cd570 into…

Authored by Hao Wu <wuhao.wise@gmail.com> on Apr 20 2017, 7:03 PM.
This commit has been deleted in the repository: it is no longer reachable from any branch, tag, or ref.
GitHub <noreply@github.com> committed R23:d3d3c8cddfba: Merge e3c5d1d55a07d9cb152e5d69d7584cb7131cd570 into… (authored by Hao Wu <wuhao.wise@gmail.com>).Apr 20 2017, 7:03 PM

Merged Changes

CommitAuthorDetailsCommitted
e3c5d1d55a07sid-github/Hao Wu
timeout was being thrown as assertion failure... changed it back to timeout… 
Apr 20
1f5f698227fdsskhandp/Hao Wu
Wait for rotation to complete before verifying that it changed. 
Apr 20