Mas i275 upgradesupport#1382

martinsumner wants to merge 2 commits intodevelop-3.0basho/riak_test:develop-3.0from

mas-i275-upgradesupportbasho/riak_test:mas-i275-upgradesupportCopy head branch name to clipboard