[HFX-1036] CA-113392: Fix PBD password-secret lifecycle