Group disks configuration fix

Closes-Bug:#1319306

Change-Id: Ib1703b256e7e7b53266e2719178d93eb0e38c44c