Add boostrap and policy server checks to self-diagnostics