There are a few more places in Xenial 4.4 that still use open-coded
magic numbers instead of the new model name macros. Fix that.

CVE-2018-12126
CVE-2018-12127
CVE-2018-12130
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Acked-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>