Merge proposals dependent on lp://qastaging/~oem-solutions-releng/live-build/lb-sg-2.x-zsynczsync-fix

1. lb-sg-2.x-zsynczsync-fix
2. Dependent merge proposals