Allow nested control fields to work within the same module
removed explicit versions from the table file.
Merge branch 'tickets/3148'
Merge branch 'tickets/3162'
Merge remote-tracking branch 'lsst/master' into github