[blivet][master/rhel7-branch] Prefer ID_SERIAL over ID_SERIAL_SHORT (#1138254)