Cleaning out options we don't want to present to customers#2

Shoeler wants to merge 8 commits into

mainShoeler/vault_client_count:mainfrom

customer_safeShoeler/vault_client_count:customer_safeCopy head branch name to clipboard