Merge proposals dependent on lp://staging/~sil2100/cupstream2distro/additional_check_full_sync

1. additional_check_full_sync
2. Dependent merge proposals