Add neutron groups

Change-Id: Ib562d234e9519e1bad981db3817b163e31a5ea16
Merge "Add neutron groups" into stable/4.1