<oo-install> backport latest oo-install changes