r4630 align version blocks in trunk and maintenance