Bug fix in the table definition
Merge pull request #2016 from atsareg/fix-v6r11

[v6r11] Minor fixes
v6r11p7 notes
Conflicts resolved with rel-v6r11
v6r12-pre6 notes