Swap out graphite 2 for graphite 4

Adds graphite 4 config
Updates config

Updates server ips
Updates supervisor config
Merge branch 'master' into graphite2

Conflicts:
	conf/local_settings.py