Initial minor changes to support RHEL based rpm package locations.