BISERVER-10378 - Fixes for unit tests
Merge pull request #328 from pminutillo/5.1-sandbox

BISERVER-10378 - Fixes for unit tests