Fixes Riak 2.0 on various clouds, adds prelim work for Docker