Fix config updates 2

#5527 wasn't enough. We are not waiting for the final value before pushing; this will wait for pending updates on the `Agent` to complete.

@stephanfowler