Merge "Move GrantorDescriptor definition out of MQDescriptor"