Revert "Revert "Do not reload config when queue is not ready""

This reverts commit bcb15e00b3bd8804417d7401cff12a941bdb8aee.
The test that was previously failing on stable-3.0 has been fixed
with Change-Id: I2bef00e701 and thus does not represent anymore an
impediment for getting this fix merged in stable-2.16 and stable-3.0.

Change-Id: I936e3547ff4533850d538fe6b9fada7437bf4e49