remove errant bts_keyhotee
make call to cli constructor use the same type of arguments it expects
merge from upstream/master