Remove ff-only requirement of merge of immediate into deferred branch
Remove ff-only requirement of merge of immediate into deferred branch

As it'll never succeed. We'll just have to let it have a go at merging
normally, and fail if there are any merge issues.
ukf/ukf-meta,ukf/ukf-meta,ukf/ukf-meta