Add support more for differences between PHP and ISO for timezone names