FL-384: lastest fixes to portage, quick mask for testing