I had a similar issue a couple months ago when we upgraded our WAP's from Aruba to Extreme. I had the port set to unTagPvid and as soon as I plugged in the Extreme WAP it would switch to TagAll. It did not take 20 minutes though. I disabled fabric attach on those ports and that resolved my problem.