Upgraded behat to 2.5
Merge branch 'master' into behat-2.5
Merge branch 'master' into behat-2.5
Merge pull request #600 from akeneo/behat-2.5

Upgraded behat to 2.5