Merge pull request #98 from andymcc/master

Merged automatically by jenkins after successful gate test
stop and restart the services correctly for RHEL
Merge pull request #99 from rackerjoe/RPM

Merged automatically by jenkins after successful gate test