2/20 Ubiquiti US-48-POE switches have issues on every firmware update

I have 20 Ubiquiti US-48-POE switches scattered around the facility. When I push out the firmware updates from the UniFi controller, there are two switches that have the following behavior:

1. UniFi controller goes through downloading/writing process
2. Controller restarts the switch
3. Switch never reports back to the controller which reports switch offline
4. Switch continues to function normally from the client point of view, PoE and data all working normally
5. Switch can be pinged
6. SSH to switch results in "Network error: Software caused connection abort"
7. Manual power cycle of switch triggers (I assume) reflash of firmware - the switch will reboot and display the updated firmware but it takes a couple of minutes longer than just a regular reboot

Has anybody else seen this? Is there something I can do other than an RMA?