Fix existing test failures

[vdarulis]

Overview

Fix existing test failures, so test suite passes. Results after merging #1 and #2 into this branch:

╰─$ make test-race                                                                                                                                                           130 ↵
go test -timeout 20m -race ./... -tags=' '
ok  	github.com/m3dbx/pilosa	90.464s
?   	github.com/m3dbx/pilosa/boltdb	[no test files]
ok  	github.com/m3dbx/pilosa/cmd	1.728s
?   	github.com/m3dbx/pilosa/cmd/pilosa	[no test files]
ok  	github.com/m3dbx/pilosa/ctl	6.521s
?   	github.com/m3dbx/pilosa/encoding/proto	[no test files]
?   	github.com/m3dbx/pilosa/enterprise	[no test files]
?   	github.com/m3dbx/pilosa/enterprise/b	[no test files]
?   	github.com/m3dbx/pilosa/gcnotify	[no test files]
ok  	github.com/m3dbx/pilosa/gopsutil	1.443s
?   	github.com/m3dbx/pilosa/gossip	[no test files]
ok  	github.com/m3dbx/pilosa/http	6.796s
ok  	github.com/m3dbx/pilosa/inmem	(cached)
?   	github.com/m3dbx/pilosa/internal	[no test files]
ok  	github.com/m3dbx/pilosa/internal/clustertests	(cached)
ok  	github.com/m3dbx/pilosa/internal/test	(cached)
?   	github.com/m3dbx/pilosa/logger	[no test files]
?   	github.com/m3dbx/pilosa/lru	[no test files]
?   	github.com/m3dbx/pilosa/mock	[no test files]
ok  	github.com/m3dbx/pilosa/pql	1.441s
ok  	github.com/m3dbx/pilosa/roaring	708.586s
ok  	github.com/m3dbx/pilosa/server	174.753s
ok  	github.com/m3dbx/pilosa/stats	2.596s
ok  	github.com/m3dbx/pilosa/statsd	1.357s
ok  	github.com/m3dbx/pilosa/test	1.626s
?   	github.com/m3dbx/pilosa/toml	[no test files]
?   	github.com/m3dbx/pilosa/tracing	[no test files]
?   	github.com/m3dbx/pilosa/tracing/opentracing	[no test files]
make test-race  1048.52s user 81.05s system 157% cpu 11:55.40 total

Updates m3db/m3#2540