FL-869: incorporate gentoo package.mask handling into tree updates