Merge pull request #13328 from teohm/dbconsole_support_database_url

Fixed rails dbconsole to support DATABASE_URL
Conflicts:
	railties/CHANGELOG.md