1105636 - saving a unit through a conduit now fails over to adding or updating if a unit appears or disappears unexpectedly
improvements based on review.
fixing unit test to work with older versions of mock
Merge pull request #1014 from pulp/mhrivnak-1105636

1105636 - saving a unit through a conduit now fails over to adding or updating