Cherry-pick commits from master-branch cocaine-bf.spec