BISERVER-10923 - Fixed scheduler tests
Merge pull request #1225 from rmansoor/master

BISERVER-10923 - Fixed scheduler tests
[BISERVER-10923] Fix platform unit tests
Merge pull request #1226 from mdamour1976/master

[BISERVER-10923] Fix platform unit tests