Merge pull request #25 from zenoss/feature/ZEN-11772

Send image_id and prodstates to applyDataMap, and remove nested transaction.  Fixes ZEN-11772.
Add tests for manual changes of the model