I have RMAd the AP once already however I appear to have a second AP that is doing the same thing. It does not actually upgrade the AP and remains stuck on the same firmware as when it arrived.
So when the AP reboots and you look at the cli option 4 " Show Version Information" it is the same as the shipping firmware, and you have the latest firmware applied in the template for that model?