Merge conflicts resolved for 3.2/testing -> testing.

Merge branch 'maint/3.2/testing' into dev/zhill/testing-merge

Conflicts:
	cluster/handlers.c
Handling the merge from maint/3.2/testing to testing. This branch is from last week.
Will follow-up with another merge for maint/3.2/testing as of today.

Merge branch 'dev/zhill/testing-merge' into testing

Conflicts:
	cluster/handlers.c
Merge branch 'testing' of git.eucalyptus-systems.com:eucalyptus into testing