Backport 2i/1.4 updates from the docs redesign (jrd-2i-1.4) to the current design
Merge pull request #459 from basho/jrd-2i-1.4-master

Backport 2i/1.4 updates from the docs redesign (jrd-2i-1.4)