Fix for doctrine mappings issues in ShippingBundle.

This should fix #339.