fixes cuke flicker
improves step definition performance and readability
Merge pull request #1530 from opf/fix/package_cuke_flicker

Fix/package cuke flicker