Issue #237: Reset Backdrop update numbers from 8xxx to 1xxx.
Issue #1317626: Followup to docs updates to remove merge conflicts.
Merge pull request #267 from quicksketch/fix-merges

Issue #1317626: Followup to docs updates to remove merge conflicts.
Issue #137: Disable noConflict mode.
Merge pull request #220 from quicksketch/237/reset_update_numbers

Issue #237: Reset update numbers from 8xxx to 1xxx.
Issue #77: Replace the class registry with a more robust alternative.
Issue #237: Correct logic in schema comparisons when updates are missing.
Merge pull request #269 from quicksketch/237/reset-updates-fix

Issue #237: Correct logic in schema comparisons when updates are missing.
Issue #245: Ensure random SimpleTest prefixes are actually unique.
Merge pull request #270 from quicksketch/245/testing-prefixes

Issue #245: Ensure random SimpleTest prefixes are actually unique.
Merge pull request #268 from quicksketch/137/no-conflict

Issue #137: Disable noConflict mode.
Merge pull request #231 from quicksketch/77/robust_registry

Issue #77: Replace the class registry with a more robust alternative.
Issue #73: Simplifying settings.php database connection and config options. Moving to the root directory.
Issue #73: Improve error reporting when the config directory is not found.
Merge pull request #234 from quicksketch/73/settingsphp

Issue #73: Simplifying settings.php database connection and config options. Moving to the root directory.
Merge branch '1.x' of github.com:backdrop/backdrop into 1.x