Two patches got merged with the same version update number so might as
well have the upgrade steps in the same 'if' statement

behatnotneeded

Change-Id: I2d9e24fc967a491d5a1d3d76e1f45bc8545ff4ab
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>