Ensure we don't fail if that file is missing.
Merge bug24759
stable to default