Re-order refresh patches. Also split the 'Generic plugin updates' patch