Pilfered from billc.

QAR-1654 merge completed.

The sets module is no longer needed with Python 2.4, and causes a
DeprecationWarning with 2.6, so drop it

The md5 module causes a DeprecationWarning with 2.6, so try to import
hashlib (its replacement) instead, else fall back

Reviewed by Poppy.

tests to fail.

Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462

svn merge -r116334:116916 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2

Result of svn merge -r115238:115240 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial_slave_merge into trunk. In turn a result of svn merge -r113279:113280 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial-changes-1 into trivial_slave_merge and svn merge -r107805:110030 svn+ssh://svn/svn/user/phoenix/slave-ds into trivial_slave_merge. QAR-1329

svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113

Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165

svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge

svn merge -r104949:105037 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-06-release-merge
QAR-1048: Distributed L$ Transactions > Rad Chilies 06 Indra items

  svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.

QAR-963 svn merge -r101685:101752 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge

=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .

QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar

DEV's fulfilled as part of this branch:
======================================

DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location

* Shifted common code for copy_bans.py and del_empty_estates.py into the indra library.
* Documented copy_bans.py and del_empty_estates.py.
* Added iter_chunks generator to a new module: indra.util.iterators.
* Added unit tests for indra.util.iterators.

DEV-22018 : cllsd unit test failures.  Fixed mostly by changing the Python code and the tests to look more like cllsd.

QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release

svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release

Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824

QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release

Related Jiras:
1. DEV-17797 New Top Causes of Inventory Loss is Attachments with null folder_id
2. DEV-17937 null asset id not handled correctly in ais inventory fetch
3. OPSRT-1097 Update python-indra package on the system images
4. DEV-20505 QAR-751: Banning Cap "FetchLibDescendents" results in error in viewer log.
5. DEV-20328 QAR-751 Excessive log spam when using ais viewer against ais sim
6. DEV-20335 QAR-751 AIS bans are missing from message.xml

svn merge -r95983:96590 svn+ssh://svn/svn/linden/branches/ais-for-merge-qar-751 .

Miscellaneous commit:
1. Fixed silly bug in llsd-rest that broke connects to https on a non-standard port

One-liner fix for indra.base.llsd.parse_datestr. Ensure that seconds are always 2 digits if there are no microseconds. Updated unit tests to enforce this. Reviewed by James.

Sub-QARs
1. QAR-765 Rad chilies 04 to Release
2. QAR-799 Merge PHP Framework 4 changes to release
3. QAR-801 Merge Buildme for startlocationfix

svn merge -r93906:94028 svn+ssh://svn/svn/linden/branches/combo-merge-qar-765-799 .

Squeezing fix for DEV-16861: Tracebacks in backbone(multiagentchat) into release.  2 line change.  Approved by josh

merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release

svn merge -r88806:88810 svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-05 into release

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release

ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release

dataserver-is-deprecated

svn merge -r87349:87423 svn+ssh://svn.lindenlab.com/svn/linden/branches/escrow/liquid-banjo-03-merge release dataserver-is-deprecated

Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated

QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated

Original Jira: https://jira.lindenlab.com/browse/DEV-11178 (Proposal: To rename named query files to take an extension .nq)
Sandbox Jira:  https://jira.lindenlab.com/browse/QAR-470 (Test a massive rename of named query files from being extensionless to having a .nq extension)
Merge Buildme: https://jira.lindenlab.com/browse/QAR-473

Original Code Review: BillC

svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release

Backport fixes made in the production branch to the trunk now that it is live on the grid:
* DEV-14443 Launcher not producing colo prefix when looking up sim class
* DEV-10840 "/etc/init.d/backbone stop" returns before all child backbones exited; "backbone restart" results in defunct children
* DEV-12558: Able to make anyone's object shout error messages
* QAR-483 user start location migration prelude
* QAR-490 havok4-6
* Revert havok4-5/4-6 code changes causing parcel access check issues
* Revert QAR-277 sqlite-backbone
* DEV-12357 SEC-53: Script that crashes regions
* QAR-486 New proc and query for Web Classifieds Fix

QAR-431

QAR-277 svn merge -r83278:83442 svn+ssh://svn.lindenlab.com/svn/linden/branches/sqlite-backbone-merge

 svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/

Merge fix for DEV-11639 - fix for llsdhttp.py to work with newer eventlet API