updates for next version release
Merge pull request #3418 from yashodha/version-fixes

updates for next version release
Syntax conformance test fixes
Merge pull request #3419 from eileenmcnaughton/test_fixes

Syntax conformance test fixes
Fix & test mail setting caching to fix test
fix api price field value - default to is_active
api_contribution_page - default to is_active
fix spelling
CRM-12872 - Consolidate search js for ajax vs simple selections
Merge pull request #3420 from eileenmcnaughton/test_fixes

Fix & test mail setting caching to fix test
Add select2 to group lists
CRM-14737 - Clear unwanted checkboxes after search action
PriceSet BAO - fix spelling & remove unused var
formatting & comment fixes
api contribution page default to is_active
test - fix api_mail_settings test
Merge pull request #3422 from eileenmcnaughton/test_fixes

Test fixes & a few minor tidy ups, fix mail_settings in particular
CRM-14778 in order to add unit test separate out function that sets some amount params
CRM-14778 remove unused var & move simple assignments to be at start of function
enotice fix