Merge "Remove fs_config lines for /data/*test*." into main