rfe-1447 - Use single table to display Charsets and Collations

Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
Merge pull request #807 from Chanaka/rfe_1447

rfe-1447 - Use single table to display Charsets and Collations