Merged changes to trunk, closing ticket.

Merged production-choose-url to production, deployed on a5.

I just updated the translation string in the master, synced the
translations, pushed to translate.creativecommons.org.

I believe those links are contained in the translated strings.  I have changed
both references in the template but the changes won't be reflected until the
translations are updated.

Issues on /choose/results-one:
The "supporting Creative Commons" link should point to
https://support.creativecommons.org/donate

"Or, have it emailed to yourself."  still points to /license/

The staging server now has the engine mapped to /choose

http://staging.creativecommons.org/choose/

Also, I have updated the Apache and Varnish configurations to handle the redirects.

If you see any remnant references to /license in the chooser pages, let me know
and I can change the template before it is moved to production.

The presence of /license/ in the URL of the CC0 chooser is confusing to some
users.  We want to make it clearer that the tools under /license/ are not
licenses themselves, but tools.  To that end we'll move /license/* to /choose/*.
 Marking the world as nosy so that people are aware I'll be landing this
[somewhat big] change.

Necessary steps:

* Make Zope understand /choose/; this will require modifying the root object in
the ZODB
* [Probably] make Zope redirect /license/ to /choose/ as a backup catch
* Update Varnish to pass /choose to Zope instead of /license
* Add redirection in Apache to send /license* to /choose

Open questions:

* Are there partner interface calls that this will interfere with?  Most should
be fine -- it's designed to be accessed from a browser which will follow
redirects.  However we need to look at recent logs for calls to get-rdf and
get-html to inspect the user agent.