Correcting problems related to logback switchover, and to cherry-picking from the 0.11.x branch when things have changed on the master branch quite a bit