The reason we did it this way is so that we could easily merge requests between the updated master branch and the 201x branch.  Are cross-repository cherry-picks viable?  If so, I would agree.