Merge pull request #214 from tmorgner/master

PRD-4653 and fixes for broken BISERVER-9988 fix
[No case]: Moved some tests to the log-running category, so that they do not clog up the build system.