[PR] Ignore upgrade directory

Also updates tracking commit on WordPress trunk