renaming some mentioning of planSelector to planSelectorForRemoval, since they are not completely the same and this may lead to confusion. Is a left-over from some wrong naming some time ago; still needs to be cleaned up fully.
Authored by: vsp_nagel 2015-01-23
Parent: [r31810]
Child: [r31812]