Item12952: various bugs highlighted during testing
Merge branch 'master' of https://github.com/foswiki/distro