default logstash.redis_key was wrong as per beaver deploys
Merge branch 'pkg_update_redux' into pkg_update_redux_plus_input_output

Conflicts:
	logstash/map.jinja