Merge "migrating to proposed common network settings file"