Don't reset inheritance_column when setting explicitly.

This is backported from master (cdfcbc4).
Added changelog for 55e2954
Merge pull request #9576 from fredwu/backport_fix_explicitly_inheraitance_column_to_3_2_stable

[Backport to 3-2-stable] Don't reset inheritance_column when setting explicitly.