Issue #2818155 by Yogesh Pawar, edgewl2: Add comments to d6_file stating the conflicts with d6_user_picture_file