BISERVER-9514 - Fixed compile errors
Merge pull request #761 from rmansoor/master

BISERVER-9514 - Fixed compile errors