Mark collections control panel as "old style" on upgraded instances.
Fixed mismatched tag in controlpanel.xml, adding permission.
Merge commit ac88ac9 from master into 1.2 branch.
Merge in 4.1.4, 4.1.5 upgrade steps.

Conflicts:

	plone/app/upgrade/v41/configure.zcml
	plone/app/upgrade/v41/final.py
Add missing closing tag.
prevent acquisition of attributes without removing the aq chain needed by ResourceRegistries now to get portal_skins
Preparing release 1.2rc1
Back to development: 1.2rc2
Add 4.2rc2 profile.
Preparing release 1.2rc2
Back to development: 1.2rc3
Add upgrade step to install the CMFEditions component registry bases modifier.
Move 'rc3' to 'final'. Add upgrades for http://git.io/Ap2GKQ
Add 4.1.6 profile.

Conflicts:

	CHANGES.txt
	plone/app/upgrade/v41/configure.zcml
Preparing release 1.2
Back to development: 1.2.1
Add upgrade profile for 4.2.1
Preparing release 1.2.1
Back to development: 1.2.2
Merge in 4.1 upgrades.

svn path=/plone.app.upgrade/branches/1.1/; revision=51424

Conflicts:

	CHANGES.txt
	plone/app/upgrade/v40/alphas.py
	plone/app/upgrade/v40/tests.py
	setup.py