CP-36392: Reassign `expiryGroups` after ordering
CP-36392: Reassign `expiryGroups` after ordering

regression from db2c00d5

Signed-off-by: Danilo Del Busso <766dc0f994b57f2d2e98930ecfa5ee8fb1091a62@citrix.com>

xenserver/xenadmin,xenserver/xenadmin,kc284/xenadmin,kc284/xenadmin,kc284/xenadmin,kc284/xenadmin,kc284/xenadmin,xenserver/xenadmin