Revert "Remove duplicate definitions."

This reverts commit 72e792b6e5c32be4e541b10f722472e4052362f4.
Revert "Merge 1.2 branch changes."

This reverts commit cee4a4fc0829ec2a3c9922fb847b18ab90bef6b4.
Merge changes from 1.2 branch.

commit 4914028889ad8ef00b639bbe20140169a45a9cb9
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Thu Aug 30 21:00:29 2012 -0400

    Revert "Merge in 4.1 upgrades."

    This reverts commit e28424beaa87bbf4a1122ddaf57b5d622f22ffe3.

commit 7b754de50183186779a461f09c481f87f70dd123
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Thu Aug 30 20:59:52 2012 -0400

    Remove duplicate upgrade steps.

commit 4a0f5cfc10b5b6c72d36c27f9211eef2a54dc038
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Thu Aug 30 19:05:21 2012 -0400

    Merge upgrades from 1.1 branch.

    commit 9075664c9d67c77cdd5324f5cede5faac644f4c9
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Jun 27 11:25:06 2012 -0400

        Back to development: 1.1.8

    commit f518bc503ec60711bc3ea0c9b5f847d01f07a396
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Jun 27 11:24:03 2012 -0400

        Preparing release 1.1.7

    commit 255afa9cf74bb028a6ac640db782d662079572cd
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Jun 27 11:19:21 2012 -0400

        Add 4.1.6 profile.

    commit ccb491df3f8a81e9a14ed013f57c5a032576dedf
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Apr 18 20:49:34 2012 -0400

        Back to development: 1.1.7

    commit b7d94249ef8f3029d661bd96e471c991ace1bb34
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Apr 18 20:48:40 2012 -0400

        Preparing release 1.1.6

    commit 2a41e54c896e4b0459b6da6cdef1047fe6477f70
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Apr 18 20:41:35 2012 -0400

        Add 4.1.4->4.1.5 upgrade.

    commit 2e1296a4dfeafc7cdeddd090d361669dbe49d136
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Apr 18 20:41:25 2012 -0400

        Add missing folder for 4.1.4 upgrade.

    commit 6212f45ff6ea6af645d13c9fc5edd60b240c3028
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Feb 8 06:41:55 2012 -0500

        Back to development: 1.1.6

    commit 29c6925a8084aaaf82e73449fded065dd197e0c7
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Feb 8 06:41:10 2012 -0500

        Preparing release 1.1.5

    commit 27d31762001804359f2193c4b60cf046a2e994a4
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Wed Feb 8 06:40:27 2012 -0500

        Add upgrade for 4.1.4.

    commit 3f8b5281fa2f4a7ced907d1d9d8b970653840ba1
    Author: Vincent Fretin <vincent.fretin@gmail.com>
    Date:   Fri Jan 13 20:30:04 2012 +0100

        1.1.4 is released actually, next version is 1.1.5

    commit 8b5be862cc3156b8c091ef583eda49f61586801e
    Author: Nathan Van Gheem <vangheem@gmail.com>
    Date:   Thu Dec 15 11:15:01 2011 -0600

        Fix adding Site Administrator roles for when
        custom workflows might not have the permission_roles
          for states set

    commit ca1dfbbce299e91c63ec9e918e6fbe24528564c3
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Mon Nov 28 21:15:02 2011 -0500

        Merge changes from the 4.1.2 release that never made it back to gihub for some reason..

    commit 245c8a88372e9f329bacf6114adccceca63af0fa
    Author: Eric Steele <ericsteele47@gmail.com>
    Date:   Mon Nov 28 21:13:44 2011 -0500

        Merge changes from the 4.1.2 release that never made it back to gihub for some reason..

    commit be7d36c58b67313727a41f4a0e5583188d55913c
    Author: Eric Steele <EricSteele47@gmail.com>
    Date:   Thu Nov 24 20:02:07 2011 -0500

        Update version, add changelog entry.

    commit 941ff00b066c89ec5b9b56287883c823dfba9564
    Author: tdesvenain <thomas.desvenain@gmail.com>
    Date:   Mon Nov 21 16:46:03 2011 +0100

        avoid 4020->4100 rules being overpassed from a 4022 version

    commit 9b77e95c349d66ebcd1b1c42929c76157d4a2a33
    Author: Stefan H. Holek <stefan@epy.co.at>
    Date:   Wed Oct 5 11:31:01 2011 +0200

        Add an upgrade step to go with the changeOwnershipOf fix.

    commit e792ab7cb274eab5ef53d883831f193c39d18d00
    Author: David Glick <davidglick@groundwire.org>
    Date:   Fri Sep 23 21:20:35 2011 +0000

        fix XML error

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

    commit 1f08abd50e712ad7e6d3a5b76ab4b0b539bfede0
    Author: David Glick <davidglick@groundwire.org>
    Date:   Fri Sep 23 21:13:11 2011 +0000

        merge gopip index upgrade step from trunk, refs #11151

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

    commit 7c5ea700753945ebc463f48132630a60f1c029a8
    Author: David Glick <davidglick@groundwire.org>
    Date:   Fri Sep 23 04:56:56 2011 +0000

        Prepare plone.app.upgrade 1.1.2.

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

    commit af81d433ad9a58c90b3fb39815ba734a2771891f
    Author: David Glick <davidglick@groundwire.org>
    Date:   Fri Sep 23 04:55:25 2011 +0000

        fix broken upgrades from 4.0.7

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

    commit 5bd8dfeb4b5ca93eef331c212bdc704a376fcc27
    Author: Eric Steele <esteele@plone.org>
    Date:   Wed Sep 21 20:18:59 2011 +0000

        Fix ReST error.

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

    commit 1f3f3ea827bca06bdec872dc1947874133ff722b
    Author: Eric Steele <esteele@plone.org>
    Date:   Wed Sep 21 17:49:19 2011 +0000

        Back to development: 1.1.2

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

    commit 1e3c77ca25dcb1dfe4b9163429148d21a9f68b63
    Author: Eric Steele <esteele@plone.org>
    Date:   Wed Sep 21 17:47:21 2011 +0000

        Preparing release 1.1.1

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

    commit 6040f5dec584846d083fd5f6ede5f65b9e14c32b
    Author: Eric Steele <esteele@plone.org>
    Date:   Wed Sep 21 16:14:20 2011 +0000

        Add upgrade profiles for 4.1.1 (4100)

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

    commit 7d08735f397375f98772381cd40d237667d61de1
    Author: Sean Upton <seanupton@yahoo.com>
    Date:   Fri Sep 9 12:59:30 2011 +0000

        add changelog entry for fix introduced in r51950

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

    commit d9dd4dee28dcc546f377284be3e44344818f7160
    Author: Sean Upton <seanupton@yahoo.com>
    Date:   Thu Sep 8 23:33:47 2011 +0000

        backport fix for #12185 from trunk: calculation of duplicate UID acquisition by shortest path incorrectly computed shortest path tuple; this was breaking some 4.0 to 4.1 migrations where items without UID incorrectly acquired (see r51950).

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

    commit f42532f220eaf3d4870c359a24aca3fed145bc51
    Author: David Glick <davidglick@groundwire.org>
    Date:   Tue Aug 23 15:18:26 2011 +0000

        remove extra loop that snuck in during refactoring

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

commit e28424beaa87bbf4a1122ddaf57b5d622f22ffe3
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Thu Aug 30 18:39:58 2012 -0400

    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

commit 15e2be881ccf83e0f7654b11824ab0ee8c266d80
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Sat Aug 11 12:20:26 2012 -0400

    Back to development: 1.2.2

commit 854d55b43280077024bc32e55da84fa41f77eb2c
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Sat Aug 11 12:16:58 2012 -0400

    Preparing release 1.2.1

commit 157269c441a5ad1a9c6d7ad424ca912d073dbf1a
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Sat Aug 11 12:10:28 2012 -0400

    Add upgrade profile for 4.2.1

commit 50aa8d0aa6f582179f5579f5fb5fb8d34ba242fa
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Fri Jun 29 16:34:39 2012 -0400

    Back to development: 1.2.1

commit fd7445c905169be78ea6bdd90940c875f16cfec3
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Fri Jun 29 16:32:33 2012 -0400

    Preparing release 1.2

commit 25db61c73729ec25fa524bb681fd03912f8cc614
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Fri Jun 29 15:42:09 2012 -0400

    Add 4.1.6 profile.

    Conflicts:

    	CHANGES.txt
    	plone/app/upgrade/v41/configure.zcml

commit 98763edef032cf66e34612f032ad6e2cee121095
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Fri Jun 29 10:31:15 2012 -0400

    Move 'rc3' to 'final'. Add upgrades for http://git.io/Ap2GKQ

commit 0681ad13bf077f38fc159a074d7bad86323a3232
Author: Ross Patterson <me@rpatterson.net>
Date:   Thu Jun 7 17:44:21 2012 -0700

    Add upgrade step to install the CMFEditions component registry bases modifier.

commit b4e74a2d5513281c6dd8a537f0f472294e92d85a
Author: Eric Steele <EricSteele47@gmail.com>
Date:   Thu May 31 09:49:27 2012 -0400

    Back to development: 1.2rc3

commit d59900c3e4cb1bcd966dafd9a3594fb10c922641
Author: Eric Steele <EricSteele47@gmail.com>
Date:   Thu May 31 09:48:10 2012 -0400

    Preparing release 1.2rc2

commit 20f9db6b49c7dbd4766f2a5a7f9b648f373b9dad
Author: Eric Steele <EricSteele47@gmail.com>
Date:   Thu May 31 09:46:54 2012 -0400

    Add 4.2rc2 profile.

commit 2d821f7c71c7a768788c9db954788b2479e2c595
Author: Eric Steele <EricSteele47@gmail.com>
Date:   Mon May 7 22:09:29 2012 -0400

    Back to development: 1.2rc2

commit 667977e91b3090179332650cd5d2243996fafbfc
Author: Eric Steele <EricSteele47@gmail.com>
Date:   Mon May 7 22:08:53 2012 -0400

    Preparing release 1.2rc1

commit 430c3834802f6c1e3c6503b06ed2333ff6126b6e
Author: David Glick <dglick@gmail.com>
Date:   Thu May 3 20:40:58 2012 -0700

    prevent acquisition of attributes without removing the aq chain needed by ResourceRegistries now to get portal_skins

commit 6d21a623b5a58df10cf8f761d4966aeb40b13fd7
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Wed Apr 18 21:30:22 2012 -0400

    Add missing closing tag.

commit 9c00ee7c15141a6d52f56d764e11bb24fde4586e
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Wed Apr 18 21:18:33 2012 -0400

    Merge in 4.1.4, 4.1.5 upgrade steps.

    Conflicts:

    	plone/app/upgrade/v41/configure.zcml
    	plone/app/upgrade/v41/final.py

commit bb39620841d7032fcd6af0be827e6f2785fbcd3a
Author: Timo Stollenwerk <contact@timostollenwerk.net>
Date:   Sun Apr 15 12:46:57 2012 +0200

    Merge commit ac88ac9 from master into 1.2 branch.

commit 00ba7be0a6a11fe41b11e9e8fdb22567a5114131
Author: Maurits van Rees <maurits@vanrees.org>
Date:   Wed Apr 11 09:38:23 2012 +0200

    Fixed mismatched tag in controlpanel.xml, adding permission.

commit 5d013b044c41bfec6d26b99248688b52d5d7d447
Author: Eric Steele <ericsteele47@gmail.com>
Date:   Tue Apr 10 21:07:11 2012 -0400

    Mark collections control panel as "old style" on upgraded instances.