CAAT-2607 only re-apply config when necessary