Item11267: Change trunk update to use distro
Merge branch 'master' of github.com:foswiki/distro