Merge pull request #10417 from jholton/fix_association_auto_save

autosave_association issue that occurs when table has unique index (resubmission)
Conflicts:

	activerecord/CHANGELOG.md
Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_association

Do not re-save destroyed association on saving parent object