Fix concurrency task failure for test_nh
Merge pull request #350 from manishsing/master

Fix concurrency task failure for test_nh