Initial merge of 1.20 into master
Add extra logging
Merge pull request #549 from wallyworld/merge-1.20

Merge of 1.20 into master

This PR merges 1.20 into master to ensure nothing done for 1.20 has slipped through the cracks. After resolving all conflicts, the only remaining change is the recently committed 1.20 work to make lxc containers copy tools from the file system.