Cleanups

VLrequested to merge
samba-team/devel/samba:vl/025ac148bb0 into master

Merge request reports