[NEXUS-6070] Transition capability to removed regardless if onRemove() fails

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>