Revert "Revert "Fixes issues #359 and #360.  Copies FulfillmentType to new fulfillment groups in matchFulfillmentGroupsToMultishipOptions method in FulfillmentGroupServiceImpl.  Adds FulfillmentType to key generation in getKey method in FulfillmentGroupServiceImpl.""

This reverts commit c718c4288266aaf87443767c8d399af34414f095.

collapseToOneShippableFulfillmentGroup method in FulfillmentGroupServiceImpl created from collapseToOneFulfillmentGroup.