fix merge2

12 jobs for GONRG-4697-hide-password-bootstrap-log in 6 minutes and 20 seconds (queued for 2 seconds)