Simplified hz 3.2 rc1/2/3 to 3.2 since 3.2 is released.

Added hz 3.3 plugin
Resolved conflicts