Merge pull request #12 from zenoss/develop

merge develop to master
Make the version on master correct. Reviewed by plu
bump version to 2.0.2 on master
Merge pull request #14 from zenoss/feature/ZEN-8978-master

bump version to 2.0.2 on master
Bump versions for the 2.0.3 release
Finished release 2.0.3.

Conflicts:
	java/amqp-api/pom.xml
	java/amqp-samples/pom.xml
	java/pom.xml
	java/protobufs/pom.xml
	python/setup.py
Bump versions to 2.0.4{dev,-SNAPSHOT}