support --bootstrap --policy-server <address> and -Bs <address> options during a transition period
Merge pull request #446 from estenberg/feature/bootstrap-deprecation

rewrite --bootstrap --policy-server <address> and -Bs <address>