MDL-74853 various: add second parameter to htmlentities functions