[BZ 1136996] Call the update lock of disc. callbacks a better name.
[BZ 1135034] Only fill the upgrade report when needed to reduce traffic.