Fix build break and increase wait condition timeouts.
Merge pull request #699 from Juniper/ms_bug

Merging build break on fedora