Fixed processing of module groups from default_data

Closes bug 1314558

Change-Id: If29deca08942f8987a1176cacdd57d0c15a248fd
Merge "Fixed processing of module groups from default_data"