Simplify user_admin() callback
Update test to standardize on Add user account rather than Add user per Jen
Issue #270: Enable views by default
Merge branch 'clouseau-clouseau-detangle-user-form' into 1.x
Issue #1829308 by aspilicious: Convert variables in menu.inc to config and state.
Issue #1705748 by n3or, tim.plunkett, sun, xjm, boombatower: Convert simpletest settings to configuration system.
Issue #805858 by Pancho and Steven Jones: Affected rows inconsistent across database engine.
Merge pull request #369 from quicksketch/274/db_update_return

Issue #805858 by Pancho and Steven Jones: Affected rows inconsistent across database engine.
Issue #276: Optimize db_merge() to use one fewer query on updates.
Issue #276: Remove unused implementation of separate conditionTable from MergeQuery class.
Merge pull request #370 from quicksketch/276/optimize_db_merge

Issue #276: Optimize db_merge() to use one fewer query on updates.
Merge pull request #366 from jrearick/270-enable-views-default

Issue #270: Enable Views by default.
Separating test SQL comment statement to prevent type hinting errors in IDEs.
Merge pull request #354 from hellomrcat/170-simp

Issue #1705748 by n3or, tim.plunkett, sun, xjm, boombatower: Convert simpletest settings to configuration system.
Merge pull request #359 from hellomrcat/170-menu

Issue #1829308 by aspilicious: Convert variables in menu.inc to config and state.