fix test to not use folder contents
Merge remote-tracking branch 'origin/master' into remove-dt-dl-dd
Remove DL from /@@rules-controlpanel