Revert "decom'ing sq33, fixing role/cache.pp puppet and ganglia.pp puppet ot match standards"

What is this shit?

This reverts commit 617ae299ae2983b9ec2f0bc9aaf728f9634a817d

Change-Id: I4400bce92f977bb10aba37b61dc11d4f2689e78d