Merge "Makefile & build.sh updates for RPM Building"