[cfid-516] Ensure all client overrides are honoured

Bootstrap loop was returning after the first override,
preventing further updates. [Fixes #42692533].

Change-Id: I71ec5a37a75b9b5708843dac41d5975e01f4a4ee