Ready: Fixes to 2.0 upgrade guide

In response to @jrwest comments [here](https://github.com/basho/riak_ee/issues/262)
How about `bucket/key` and `bucket type/bucket/key`? Or some way to make clear they're a group, rather than alternatives (eg *this and/or that*)