MB-20388 Resolve clang build warnings
MB-20388 Resolve clang build warnings

Change-Id: I40874560778677f58fc747161f75402e2aa4b9e6
Reviewed-on: http://review.couchbase.org/67209
Tested-by: buildbot <80754af91bfb6d1073585b046fe0a474ce868509@couchbase.com>
Reviewed-by: Dave Rigby <a09264da4832c7ff1d3bf1608a19f4b870f93750@couchbase.com>

Chippiewill/phosphor,Chippiewill/phosphor