Fixes for cleanup retains scheme #32052

Job	Run time
test	54m 38s
test_non_bootstrapped	0s
MiMa	10m 24s
test_scala2_library_tasty	0s
test_windows_fast	38m 14s
community_build_a	38m 39s
community_build_b	1h 22m 28s
test_sbt	18m 31s
community_build_c	1h 0m 11s
test_windows_full	0s
build-msi-package	0s
test_java8	0s
build-sdk-package / build	7m 40s
build-chocolatey-package / build	23s
test-chocolatey-package	0s
publish_nightly	0s
publish_release	0s
nightly_documentation	0s
open_issue_on_failure	0s
	5h 11m 8s

Provide feedback