Restore the ability to create a TypeDescriptor for a collection or map where the generics may be null. Issue: SPR-11006