Cleanup/bootstrap

WARNING: backward-incompatible. Require argument to --bootstrap, deprecated --policy-server.