Merge 2.9 into 3.0#754

martincox wants to merge 8 commits intodevelop-3.0basho/yokozuna:develop-3.0from

develop-2.9-3.0-mergebasho/yokozuna:develop-2.9-3.0-mergeCopy head branch name to clipboard