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

OOIION-692: Make store_interfaces idempotent and update CFG