Upgrade monitoring manager distribution
Minor fixup
Update graphite templates