FELIX-2275 : Component descriptor reference elements are not ordered - Applied patch from Stephen Flynn