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

Change-Id: Id3e3b04d35bf78f92d7f3e98d34034d685a8c40a