Fix behat.yml example and improve doc
Merge branch '2.5'