CRM-13389, CRM-13555 - Upgrade from 4.0.* to 4.4: DB Error: no such table civicrm_setting

Backport https://github.com/civicrm/civicrm-core/pull/1805 to 4.3. This should allow our Jenkins dashboard to show the upgrade tests as passing.