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

* QAR-567 Deploy user-start-migration-again login.cgi and friends to agni
* DEV-14807 dir-places and dir-classifieds web-ds calls are failing
* DEV-9962 SVC-1428: Malformed llInstantMessage() gets sent to email, stuck in queue, and spammed to email at every login
* DEV-12696 Limit the number of group_notices in a group

NOTE: merge involved renames to the following to have "nq" extension
* indra/web/dataservice/sql/sequence/cart_items/update (actual change)
* indra/web/dataservice/sql/indra/select-dir-places-parcel (which was a no-op merge)

The magic words are: dataserver-is-deprecated

QAR-242 merge of maintenance-5 (QAR-203)
* DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
* DEV-7600 Deleting someone else's object in god mode crashes sim
* DEV-5329 LLSD parsers should determine and set maximum parse sizes
* DEV-7473 Resolve instant message crash report
* DEV-2904 Presence Issues not (apparently) caused by scripted attachments
* DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid
* DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory.
* DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc
* DEV-8002 c++ llsd notation parser accepts malformed data
* DEV-8001 c++ xml parse returns wrong number of elements parsed
* DEV-8089 Double delete in statc structured data parse functions
* DEV-5326 Any viewer can request presence information for any agent
* DEV-2378 python service builder does not sort query string
* DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University
* DEV-4465 Add a "logfile" command line option to the sim to create log files

Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.

merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses