CRM-12357
CRM-11948 - Apply patch for running with a remote Selenium server. (This isn't currently/strictly needed for CRM-11948 but was previously written for it -- and it's come up in other contexts.)

----------------------------------------
* CRM-11948: Run WebTests under Jenkins
  http://issues.civicrm.org/jira/browse/CRM-11948
Merge pull request #501 from totten/selenium-remote

CRM-11948 - Apply patch for running with a remote Selenium server.
Merge pull request #500 from yashodha/more-work

 CRM-12357
CRM-12274
CRM-12274
CRM-12274
Merge pull request #504 from yashodha/more-work

CRM-12274
-- fix for CRM-12292
Improvments in demo management scripts
CRM-12274

----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
  http://issues.civicrm.org/jira/browse/CRM-12274
Merge pull request #508 from dlobo/CRM-12274

CRM-12274
Merge pull request #507 from deepak-srivastava/mastro

Improvments in demo management scripts
Merge pull request #506 from ravishnair/CRM-12292

-- fix for CRM-12292