DOC-1329 and DOC-1330: descriptions for dns.spoof properties added or corrected.
Edits from Marten's review.
Fixing Riak to Riak CS.
Riak fixes.
Riak edits for Basho info.
Merge branch '4.0'