HPCC-9097 Correct issue with package naming for windows and mac

Moved base package naming out of linux only block while leaving
renaming of plugin packages for RPM's in linux only block.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Merge pull request #4342 from pschwartz/HPCC-9097-package-with-plugins

HPCC-9097 Correct issue with package naming for windows and mac

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>