Back to 7.x-dev

Conflicts:
	includes/bootstrap.inc
Issue #2268947 by sachin_s, joachim: Add note to hook_field_formatter_settings_form() about when it is invoked
Issue #2276469 by decibel.places: Fixed robots.txt syntax checking link broken.
Issue #2273337 by vegantriathlete, ducktape, joachim: Fix up docs for db_add_field and related functions
Issue #2267159 by juampy, xjm, alexpott: Remove nonexistent parameter from DrupalWebtestCase::assertNoLink docs
Issue #2248799 by amitgoyal, c31ck, Wim Leers: Fix docs for system_sort_themes
Issue #2277623 by mparker17: Fix up docs for drupal_parse_url function
Issue #2263047 by joshi.rohit100, lostkangaroo, sachin_s, martin107: Fix up hook_help docs and move to system module
Issue #1956782 by joshi.rohit100, bdimaggio, tanmayk, chertzog: Document parameter to xmlrpc_server()
Issue #2290435 by PQ: Fix broken link in robots.txt file
Issue #2039449 by joshi.rohit100, joachim, lokapujya, Jalandhar, paulh, yaworsk: Fix up docs for assertField and assertNoField methods
Issue #2141221 by joshi.rohit100, dcam, thedavidmeister, joachim, anemes: Add docs to hook_update_N() about sandbox parameter
Issue #2054189 by ShaunDychko, pc-wurm, joachim: Fix docs for field_info_instance()
Issue #2098129 by er.pushpinderrana, drupal_sensei, Berdir, joachim: Fix docs for DrupalDefaultEntityController entityCache variable
Issue #2267411 by er.pushpinderrana, amitgoyal, klausi, David_Rothstein: Document that field_access() does not check entity access
Issue #1369822 by amitgoyal, Cottser, er.pushpinderrana: Fix docs for template_preprocess_user_profile()
Merge tag '7.29' into 7.x

7.29 release

Conflicts:
	includes/bootstrap.inc

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc
Issue #2012468 by joshi.rohit100, blueminds, David_Rothstein, plach | catch: Add trusted roles recommendation to 'access site reports'.
Issue #2249025 by xjm, clintrandall777@gmail.com: Update Security topic coordinators section in MAINTAINERS.txt.
Issue #2305017 by David_Rothstein, pwolanin | beech: Fixed Regression: Files or images attached to certain core and non-core entities are lost when the entity is edited and saved.