AS7-6567: countdown the latch on any throwable
AS7-6500 Add check to make sure method is not overriden on injection
Add remove step handler for the common case of removing a single service