EAP6-18: Refactoring - generic patch wizard and step as preparation for rollback