Initial pack of changes for capybara 2.3 compatibility