Update RHEL version in cacti
Replace rpmquery with rpm -q

This fixes gen-makefile-from-src-rpm script on RHEL7.
It appears there are some bugs in rpmquery, and rpm -q is the
preferred route.
Fix typo in kickstart Makefile for SETUP_DEPS