Introduces OSG and RiakCS integration. Merge of tech-preview (team/storage/tp-to-testing) branch.

Includes a merge from 3.4.1/testing as well.