BISERVER-8659 - fixed compile errors
Merge pull request #237 from rmansoor/master

BISERVER-8659 - fixed compile errors