Merge topic 'FindPNG-compatibility'

6816044 FindPNG: Honor old PNG_LIBRARY if provided (#14398)
Merge branch 'master' into next