The regex in mender-setup.bbclass, which is designed to extract the override and skip, fails in this instance, due to it extracting the suffix '_1', which is not a real override.

Acceptance criteria:

• Handle this edge-case in the check

• Add the MENDER_UBOOT_ENV_UBIVOL_NUMBER_{1,2} to mender-vars.json

• Same for
  MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_1
  MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET_2