Revert "Update groupId"

This reverts commit 2230ac60a3a08374d0e8779cb209941d3aec136e.
Prep 3.3.0.CR1
Next is 3.3.0.CR2