Simplified SubjectFinder taking into accunt that locators always return iterator
Merge branch '3.0' of github.com:Behat/Behat into 3.0