This stuff is all find for master, though once this is merged there should be another PR for 2.0.0 pointing at riak.conf or advanced.config