Capybara's 2s wait time is too slow for travis in saving ➙ saved

activity_run_from_portal_spec.rb was failing intermittently on Travis.
Merge branch 'master' into staging

* master:
  Capybara's 2s wait time is too slow for travis in saving ➙ saved