Merge pull request #955 from rouault/remove_opj_nosanitize