Merge pull request #2964 from nrwahl2/nrwahl2-T455
Fix: controller: Avoid election storm due to incompatible CIB