Updated documentation
Merge branch 'release/2.2.1' into develop
post release 2.2.1 -> 2.2.2dev
Send image_id and prodstates to applyDataMap, and remove nested transaction
Fixes code based on review of PR24
Fix doc string typo
Remove trailing space
Factor prodState into the utils library
Merge pull request #25 from zenoss/feature/ZEN-11772

Send image_id and prodstates to applyDataMap, and remove nested transaction.  Fixes ZEN-11772.
Add zProperties to control resetting of the guest devices collector.  zAWSGuestCollector is set from the AWS Device and allows the user to globally set the collectors for that AWS device.  zAWSResetGuestCollector is set on a guest device and if set to false will not allow the aws instance to change the collector.  Fixes ZEN-11913
Add tests for manual changes of the model
Merge pull request #27 from zenoss/feature/ZEN-11772

Add tests for manual changes of the model. Looks good.
Merge pull request #26 from zenoss/feature/ZEN-11913

Add zProperties to control resetting of the guest devices collector.  zA... A-OK
Add EC2 image/volume filtering
no inner loops
Merge pull request #28 from zenoss/feature/ZEN-11976

Feature/zen 11976
make AWS CloudWatch to use proxy when there is a proxy server
remove pdb, ProxyClientFactory. They are not needed
Merge pull request #29 from zenoss/feature/ZEN-12053

make AWS CloudWatch to use proxy when there is a proxy server
fix images filtering so huge numbers of image components are not created