Revert "Merge branch 'feature/riak-object-btype-hash-metadata' into develop"

This reverts commit 48e0a742d151085a483d53aa8fcd920cf9a48381, reversing
changes made to 014c674b96497316cfe67da41e571e73130c3e31.
Merge branch 'revert-riak-object-btype-hash' into develop