Add ColumnConfig as a part of Columns module refactor
Fix one-to-many association method falling back to 'id'
Merge remote-tracking branch 'upstream/master'