Really cleanup the content-wrapper#10421

rullzer merged 5 commits intomasternextcloud/server:masterfrom

content-wrapper-cleanupnextcloud/server:content-wrapper-cleanupCopy head branch name to clipboard