Upgrade Capybara version and fix failing matchers

1. Upgraded Capybara to latest
2. Fixed specs by updating syntax and replacing matchers where necessary.
3. Fixed a bad page count in an existing matcher (which should have been failing)

No specs were made pending, and everything runs green.  Fixes issue #2750