Adapting to new errata applicability
(cherry picked from commit 88a4aaaf3808510c4ec2198d22bfc836a5b98de4)
1018801 - fixing package upload error around "unit_type_id"
(cherry picked from commit 21878c70dc2e857f65827a0943faf19c8044eb5f)