fix xref and dialyzer errors
Merge branch 'feuerlabs-exometer4' of git://github.com/basho/riak_core into feuerlabs-exometer4