Separated cbfsclient into normal vs. admin tools

cbugg: close bug-658