Switched key bootstrap to happen before salt bootstrap