Avoid timer cancel deadlock
Merge pull request #631 from haripk/master

Avoid timer cancel deadlock, fix build error with timer UT