Release reorg

Unless a release branch diverges from master keep it in the master branch.