Fixing two digit date conversion

Conflicts:
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md