Update Avocado to 2.0.25 and Serrano to 2.0.17 (i.e. without the 'b1' suffix).