Merge "use 'workspace-cleanup' plugin in publisher"