CRM-12076 fix

Conflicts:

	CRM/Upgrade/Incremental/sql/4.3.beta3.mysql.tpl
CRM-12076-fix : gen data commit
Merge pull request #137 from pratik-joshi/CRM-12076-fix

CRM-12076 fix
Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-9394
test cleanup
more test cleanup
webtest cleanup
more test cleanup
minor test fix
Merge pull request #138 from pratik-joshi/webtest-improvement

Webtest improvement
CRM-11203 authenticate user when running jobs via cli
CRM-12111
Merge pull request #140 from dlobo/CRM-12111

CRM-12111
CRM-11203 move setUserSession from Drupal to Base so we allow optional override on per CMS basis
CRM-11203 update Joomla setUserSession to call parent method
Merge pull request #139 from lcdservices/master

CRM-11203 authenticate user when running jobs via cli
Introduce 'context' param to CRM.api CRM-12029
-- fixed formatting, static errors and replaced contribution_type to financial_type
Improve convenience/flexibility of CRM.confirm
CRM-11281