JBEHAVE-1007 Lifecycle steps are called inside the Before/After Scenario steps

Lifecycle steps were called in different order for parametrised scenarios
JBEHAVE-1007 Cleanup

Removing duplicate code