Merge branch 'net-ipa-move-configuration-data-files'