3673: Remove corrupt monitoring XML files
3673: Fix logging
Merge branch 'branch_v2plus_3673' into branch_v2plus