OOIION-692: Make store_interfaces idempotent and update CFG