A -> B -> A Improvements

Working with GUIDs across the board, the source guids are written back
when an imported bit of content is saved on the target, this should
allow imports back to the source without any major issues