BUGFIX: indent error
FIX: Use the old style grouping if the default grouping is altered
Merge pull request #1757 from atsareg/fix-v6r9

[v6r9] AccountingDB - fix the problem of grouping by Country, Grid
Merge pull request #1751 from ubeda/v6r9_intent

[v6r9] BUGFIX: indent error
v6r9p32
Conflicts resolved with rel-v6r9
v6r10-pre20