Remove extra version component from merge.
 A few more productization fixes:
  - set the rhq.pom.version.
  - reset all component versions to be same as project.version.
  - remove patched eap component incorrectly cherry-picked from 3.2 line.