ns_server sherlock in function names

I think using sherlock as function names is going to cause future confusion, in a couple years time it won't be obvious what the following means...

ns_server/src/menelaus_web.erl

966assert_is_sherlock() ->
967 case cluster_compat_mode:is_cluster_sherlock() of
968 true ->
969 ok;
970 false ->
971 erlang:throw({web_exception,
....

I know it's set with
ns_server/src/cluster_compat_mode.erl
81 is_cluster_sherlock() ->
82 is_enabled([4, 0]).
83

Perhaps it would be good to change the function names to refer to Couchbase 4 not sherlock before it GAs.