initial work on [KFSQA-609]
Merge branch 'master' into KFSQA-609
refactoring to create generic steps
Merging into master [KFSQA-609]