Fix load/save round trip.
Merge branch 'master' of git://github.com/plone/plone.app.mosaic