> does that require two rebases?

No. Just git rebase --onto=master feature-1 will do the right thing.

(Personally I merge rather than rebasing to avoid this whole problem).