Fixed ambigious step matches with generic "within" step
Removed non-functional checks for rspec matchers
Merge pull request #831 from opf/fix/ambigious_step_matches

Fixed ambigious step matches with generic "within" step