[development] RFC: 2 proposed changes to CVS branch/tag conventions