Upstream changes accepted for Yelp/uchiwa. Also revert hacky ENV variable for AIO and remove old graphite module.