Merge "Change the base docker image in the broker topology." into stable-3.4