Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Revert "Revert "Do not reload config when queue is not ready"" Add replication refs-filtering before push Change-Id: I99b0902b8f909745c3eb00490d615935cec62db1