OOIION-692: Make store_interfaces idempotent and update CFG
Merge pull request #471 from mmeisinger/fix692_dir_r2

OOIION-692: Make store_interfaces idempotent and update CFG