Field Set causing Error

This is somewhat related to http://drupal.org/node/1788302

It seems that if you have a component that is under a field set then there are two problems that occur.

1. If you intend to make a component mandatory then you receive an error on the field set, not the component itself.
2. The field set causes the import to fail because it tries to make the field set required even if the component is not mandatory.

e.g.,

I will upload a simple patch that will disregard field sets when submitting the upload.