Made table-layout a setting.
Merge pull request #5737 from GregRR/make-table-layout-setting

Made table-layout a setting.