Merge "ext4_utils: skip symbolic links in basefs file" into oc-mr1-dev