For anyone who comes across the thread. I successfully upgraded a 7104 and 7108 with the above 3.0.18 firmware, worked great with GUI upgrading.
First time I tried I did get an error but I just went to another menu option and then back again, then it worked the second time.