Use local variables in _form.html.erb generated by scaffold.

Conflicts:
	railties/CHANGELOG.md