4.5 Upgrade fix
Merge pull request #3409 from monishdeb/upgrade-fix

4.5 Upgrade fix
Merge pull request #3410 from eileenmcnaughton/testfixes_and_tidy_ups

test fix - combat caching on mail_settings
4.5 upgrade failure on line_item
Merge pull request #3411 from monishdeb/upgrade-fix

4.5 upgrade failure on line_item
Merge pull request #3412 from eileenmcnaughton/CRM-14778

CRM-14778 price set api
Merge pull request #3415 from eileenmcnaughton/CRM-14778

Crm 14778
Merge pull request #3416 from eileenmcnaughton/test_fixes

fix to syntax conformance test handling of contribution_type_id
Merge pull request #3417 from eileenmcnaughton/test_fixes

CRM-14178 fix error static vs nonstatic error introded in PR process
updates for next version release
Merge pull request #3418 from yashodha/version-fixes

updates for next version release
Merge pull request #3419 from eileenmcnaughton/test_fixes

Syntax conformance test fixes
Merge pull request #3420 from eileenmcnaughton/test_fixes

Fix & test mail setting caching to fix test
PriceSet BAO - fix spelling & remove unused var
fixes for mail_settings api
formatting & comment fixes
api contribution page default to is_active